Merge pull request #19 from theodi/update-dependencies-2013-06-12

automatically updated dependencies
automatically updated dependencies
Merge pull request #20 from theodi/update-dependencies-2013-06-19

automatically updated dependencies
automatically updated dependencies
Merge pull request #22 from theodi/update-dependencies-2013-07-03

automatically updated dependencies
automatically updated dependencies
Merge pull request #23 from theodi/update-dependencies-2013-07-10

automatically updated dependencies
automatically updated dependencies
Merge pull request #24 from theodi/update-dependencies-2013-07-17

automatically updated dependencies
automatically updated dependencies
Merge pull request #25 from theodi/update-dependencies-2013-07-24

automatically updated dependencies
automatically updated dependencies
Merge pull request #26 from theodi/update-dependencies-2013-07-31

automatically updated dependencies
automatically updated dependencies
Merge pull request #27 from theodi/update-dependencies-2013-08-06

automatically updated dependencies
automatically updated dependencies
Merge pull request #28 from theodi/update-dependencies-2013-08-14

automatically updated dependencies
Merge branch 'master' of github.com:theodi/dashboards into feature-add-tech-dashboard

Conflicts:
	Gemfile.lock