fixes layout for small devices
fix layout for wide screen
Merge branch 'bug/01-layout' into develop

Conflicts:
	public/css/main.min.css
	public/js/angularjs-all.min.js
	public/js/main.min.js