Add Bootstrap material design
Merge branch 'dev-max' into dev

Conflicts:
	.DS_Store
Merge branch 'dev' into dev-max