Added a login api call for testing
Merge remote-tracking branch 'alexpennells/master'

Conflicts:
	js/api.js