Merge branch 'master' of https://github.com/Imaginea/SocialByWay

Conflicts:
	app/assets/javascripts/socialbyway/core/lib/controller/serviceController.js