Merge branch 'master' of https://github.com/josephktcheung/pdf
Merge branch 'master' of https://github.com/josephktcheung/pdf
Merge branch 'master' of https://github.com/josephktcheung/pdf
Add navbar dropdown to show username and signout
Merge pull request #28 from josephktcheung/signin

Add navbar dropdown to show username and signout
Merge branch 'master' of github.com:josephktcheung/pdf into JulesWiz-css
Merge branch 'JulesWiz-css'
Add more fixtures to Causeway Bay
Merge branch 'master' of https://github.com/josephktcheung/pdf into pull-more-fixtures
Change flower to anything and add tabs
Merge pull request #29 from josephktcheung/pda-tab

Change flower to anything and add tabs
Fix merge conflicts in fixtures
Merge pull request #30 from xamroc/more-fixtures

More fixtures
Add even more fixtures up to Shau Kei Wan
Merge pull request #31 from xamroc/even-more-fixtures

Add even more fixtures up to Shau Kei Wan
Merge branch 'master' of https://github.com/josephktcheung/pdf into css

Conflicts:
	client/views/anythings/index.html
Fix the target profile bar