merged admin console enhancements - edm, report and privacy
fix bugs
edm subscription UI
refactoring
edm subscription bug - no duplicate subscription
Report modal wordings
bug fix - toggle newsfeed disable for community
clean up
privacy settings page
negation of subscribtion
report UI
EdmTemplate and EdmUnsubscription
remove obsolete code
css
remove obsolete code
Merge branch 'master' into dev_admin_enhancements_merge

Conflicts:
	app/controllers/UserController.java
	app/viewmodel/ProfileVM.java
	conf/routes
	public/app/custom-css/themeA.css
	public/app/images/general/titles/hot_articles.png
	public/app/scripts/ads-init.js
	public/app/scripts/controllers/main.js
	public/app/views/about-me-edit-info-section.html
	public/app/views/mobile/about-me.html
	public/app/views/mobile/visit-profile.html
Merge pull request #3 from klvh-mb/dev_admin_enhancements_merge

Dev admin enhancements merge - reporting, privacy, edm settings