grid
just some minor cahnge
Merge branch 'master' of github.com:SQLIagencych/blox
Merge branch 'development' of github.com:SQLIagencych/blox

Conflicts:
	.gitignore
Merge branch 'grid' of github.com:SQLIagencych/blox
Merge branch 'colors' of github.com:SQLIagencych/blox

Conflicts:
	app/styles/modules/_mixins.scss
	app/styles/modules/_variables.scss
merged all in one and started to do some S**T :-)
updated for cache issues
cleaned from gitignore new rules
Grid reworked to use official sass bootstrap