Google Analytics added
supply column types when generating user model
remove assets group
Merge pull request #20 from wirelab/feature/rails4

WIP: Feature/rails4
Merge branch 'refs/heads/feature/google-analytics' into develop
remove post for now to prevent error
remove compass references from css
added analytics as default var in .env
added newline to file
Revert "Merge branch 'refs/heads/feature/google-analytics' into develop"

This reverts commit 3941fe9bc9358403eb0b4440b19f3ba64c9f3f64, reversing
changes made to eda34b13a3b80c36409c18f6a6cb54306e920756.
Merge branch 'develop' of github.com:wirelab/wired into develop

Conflicts:
	templates/README.md.erb
Merge branch 'refs/heads/develop' into feature/params

Conflicts:
	lib/wired/app_builder.rb