Commit [ab3970]  Maximize  Restore  History

Merge remote-tracking branch 'dsar/stable' into stable

Conflicts:
.classpath

Obexer Christoph Obexer Christoph 2013-10-02