Merge branch 'master' of https://github.com/opengovernment/opengovernment-app into qflow
added a control to extend Devise, styles for data collections, tool tip styles
Merge branch 'qflow' of https://github.com/opengovernment/opengovernment-app into qflow