Minor changes.
Merge branch 'master' of https://github.com/WPFerg/app-design

Conflicts:
	css/theme.css
	index.html