IMPL: test grid layout using bootstrap
Update column of grid layout
Merge branch 'master' of https://github.com/buondoi/smartwork.git

Conflicts:
	index.html