Merge branch 'develop' of https://github.com/chip2int/ParkSwap into develop
Merge branch 'develop' of https://github.com/bioball/ParkSwap into develop
Merge branch 'develop' of https://github.com/bioball/ParkSwap into develop
Merge branch 'develop' of https://github.com/bioball/ParkSwap into develop
login page and main page css done
finished where page, naive solution for borders and google maps
added slide-down directive, and added styling for wait page
more work done on CSS
Updated bower json file
Merge branch 'develop' of https://github.com/bioball/ParkSwap into develop

Conflicts:
	public/lib/bower.json
Call rider and parker functions now working with android and ios
design work, and worked on preventing spamming the google API
revert some things
Merge pull request #23 from yongsoo/master

Calling on android/ios works
Calling buttons
Merge branch 'develop' of https://github.com/bioball/ParkSwap into develop
changed tabs to spaces
Refactored
quick fix
quick fix
Merge branch 'css' into develop
Merge branch 'develop' of https://github.com/bioball/ParkSwap into develop