"!"
Merge branch 'master' of https://github.com/Celeroctos/moniiag

Conflicts:
	protected/runtime/application.log