Aug 14th final commit
Merge branch 'master' of https://github.com/ayatas/musicsite

Conflicts:
	protected/runtime/application.log