Merge pull request #263 from amethystlei/master

Orange Theme
Division Summary support
Merge pull request #314 from dexyk/master

Division Summary support
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
Web Arena UI - Phase I Bug Fix 3
Merge pull request #335 from flytoj2ee/master

Web Arena UI - Phase I Bug Fix 3
static file host fix
updating build process to allow build variables on the json files inside data folder as well
updating version for deploy
Update chatAreaCtrl.js

use lower case.
Update user.chat.area.html

add space for better display.
Update app.css

fix rating indicator problem in chat widget
Web Arena UI - Rooms Tab
Merge pull request #345 from flytoj2ee/master

Web Arena UI - Rooms Tab
updating version for deploy
reverting login timeout to 30 seconds
fix issues for bug fix 3.