submission commit
FF commit
Merge branch 'match_config' into dev

Conflicts:
	app/css/app.css
	app/css/light/lightTheme.css
	app/js/app.js

commiting merged changes
Fixed merge problems
Merge pull request #939 from ananthhh/dev

Module Assembly - Web Arena - Match Configurations