first update
1
Update ruby and gems
Update gems
Remove the whitespace between navbar and content
Use migration to migrate data
All rake data:all task to merge all the rake data tasks
Merge master