Changed routes, renamed method for emptying folders
upgrade to 4.0.0
Merge branch 'refs/heads/feature/facebook-fix' into feature/rails4

Conflicts:
	lib/wired/app_builder.rb
Google Analytics added
rails 4 has actions instead of filters
updates the layout to the rails 4 layout
Merge pull request #18 from wirelab/feature/rails4

Feature/rails4
Merge branch 'refs/heads/master' into develop
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
removes duplicate route bug
cleans up the ugly errors when name is not correct