Merge branch 'develop' into 2-0-develop
Merge branch 'develop' into 2-0-develop

Conflicts:
	src/Terramar/Packages/Version.php
Added local check to index_dev
Added phpunit to composer.json dev dependencies
Added basic capistrano configuration
DefaultController->indexAction is no longer static
Fixed code style
The SessionExtension is now registered by default