~ improved makefiles
Merge branch 'master' of github.com:astralaster/oxofrmbl

Conflicts:
	src/plugins/protocols/xmpp/xmpp.pro
	src/src.pro
Merge branch 'master' of github.com:astralaster/oxofrmbl

Conflicts:
	src/plugins/protocols/xmpp/xmpp.pro
[A] chat state notifications (#11) implemented partially