201310021408

switch on alert msg
Merge branch 'master-errorFixing'
Merge branch 'master' of https://github.com/nt46/Imagic

Conflicts:
	log/development.log