final fix
merging Module Assembly - Web Arena UI - Phase I Bug Fix 2

Conflicts:
	app/css/app.css
	app/css/dark/darkTheme.css
	app/css/light/lightTheme.css
	app/js/controllers/baseCtrl.js
	app/js/controllers/chatAreaCtrl.js
	app/js/controllers/contestStatsCtrl.js
	app/js/controllers/userContestDetailCtrl.js
	app/js/factories.js
	app/js/helper.js
	app/js/resolvers.js
	app/partials/user.contest.detail.html
	bower.json
Final commit
Merge pull request #330 from ananthhh/Branch_5b0614752b6331f067c3ebae4ea7e66ae22e272e

Web Arena UI - Phase I Bug Fix 2