Changes.
Merge branch 'master' of https://github.com/kongyew/airshare

Conflicts:
	app/scripts/controllers/FindFlightCtrl.js