fixing formbuilder bug
Merge pull request #91 from codeforamerica/dashboard

Adding stats to homepage.
Merge branch 'dashboard' into develop
fixing db problems
Merge branch 'develop' of https://github.com/codeforamerica/landshark into develop
fixing main nav
Merge pull request #92 from codeforamerica/dashboard

Adding simple_forms
Merge branch 'develop' of https://github.com/codeforamerica/landshark into develop
adding newline in receiver
Merge branch 'dashboard' into develop
Merge branch 'dashboard' into develop
Filtering recent messages to be only ones sent out.
changing delayed job priorities
Merge branch 'develop' of https://github.com/codeforamerica/landshark into develop
Filtering recent messages to be only ones sent out.
Merge branch 'develop' of https://github.com/codeforamerica/landshark into develop

Conflicts:
	app/controllers/home_controller.rb
updating home controller to remove from number
updating home controller to remove from number
removing receiver
fixing token issue