My Changes
Merge branch 'master' of https://github.com/alejandrovze/MobSourcing

Conflicts:
	Resources/ui/common/FirstView.js