add migration for recent projects model change
Merge pull request #8 from apatel/dev

Contact MVC, cleaned up migrations, added formtastic
Merge branch 'dev' of https://github.com/berkmancenter/hei into dev

Conflicts:
	db/schema.rb
forcing a specific version of bcrypt-ruby
testing contact and org
progress
#5338 disable broken popover & tooltop for now
#5338 newer version of jQuery does not have live
coffee => js
db:seed can be used in any environment
#5237 don't sort on tags.name
page titles & tests
Merge pull request #9 from ryanttb/dev

mainly fixing Project#show view
fixed tagging, more test data
fav & apple icons
Merge pull request #10 from ryanttb/dev

tagging & logos
some minor title edits
app icons in root, not linked via layout
allow project view (unstyled) and edits
Merge pull request #11 from ryanttb/dev

#5356 add project editing