simple
Merge branch 'master' of https://github.com/sovic/sampleproject

Conflicts:
	application/application/bootstrap.php
	application/config.php
	build.xml