Temp Commit - Dialog
Merge branch 'dev' of https://github.com/CyberCRI/gamEvolve into dev

Conflicts:
	client/src/app/app.coffee
Merge branch 'dev' of https://github.com/CyberCRI/gamEvolve into dev

Conflicts:
	client/src/app/app.coffee