Messaging working good
Merge branch 'master' of github.com:zlosnijdani/mengine

Conflicts:
	templates/home.tpl