updated grid system and css
Merge branch 'master' of https://github.com/tallmypeople/web-client

Conflicts:
	.idea/encodings.xml