Merge branch 'master' of https://github.com/Lindar90/yii-application

Conflicts:
	build.properties