Remove all the .DS_Store files
Fix environment, gem etc..
Merge branch 'develop' of github.com:hull/hullstrap into develop

Conflicts:
	source/.DS_Store
Merge branch 'refs/heads/master' into develop
Organizations : Change cog color
Fix adminsidebar zindex
Add icon-plus
fix fix fix fix