Changed quotes and other best practice styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/api.rb