Layout
Merge branch 'master' of https://github.com/mchchrmk/tradegrade

Conflicts:
	eclipse_project/tradegrade/app/views/Register/index.html