renamed geolocate from lat long to Place.get
refactored Place.get_location_without to Place.get_without
removed generate question because it was defined in qapi_generator
removed abstract generator because the functionality was extracted to query
added .DS_Store to gitignore
Merge branch 'dev_alex'

Conflicts:
	.gitignore
changed controller inheritance
added logout button in frontend
Merge branch 'dev_alex' containing refactored controller inheritance and logout button into branch 'master'
Merge branch 'master' of github.com:secretBears/qapi
Merge branch 'dev'

merged dev
added generate_secret_keys.rb for generating keys
added rake task for regenerating keys