tesst
Conflicts:
	Client/Mobile Polla/Resources/ui/common/ApplicationTabGroup.js
klfjasd
Merge branch 'master' of https://github.com/AmbientTalk/flaming-lana