Doc updates
Merge remote-tracking branch 'ta/master'
Merge remote-tracking branch 'ta/master'
update FAQs in Get_Started page.
Updates to Gemfile
Merge remote-tracking branch 'ta/master'

Conflicts:
	Gemfile.lock
Moving code to rails 4.0.1.rc1, bcrypt to 3.1.2
Test
Merge remote-tracking branch 'origin'
DB view change