Git add
Merge branch 'angular' of github.com:like-me1/stropheXMPP into angular