Update main.js Conflicts: 	client/app/scripts/main.js
Update main.js
Conflicts:
	client/app/scripts/main.js

vied12/superdesk,vied12/superdesk,liveblog/superdesk,vied12/superdesk,liveblog/superdesk,liveblog/superdesk,vied12/superdesk,liveblog/superdesk,liveblog/superdesk,vied12/superdesk