Correction
Merge branch 'master' of github.com:jmuheim/base into features/prototype

Conflicts:
	Rakefile