Merge branch 'master' into dev
added footer navigation
added XMPP support
big refactoring include ionic
Merge branch 'dev'