Modify location to locationId in fixtures
Merge pull request #32 from xamroc/location-to-locationId

Modify location to locationId in fixtures
Add filter
Merge pull request #33 from josephktcheung/filter

Add filter
Merge branch 'master' of https://github.com/josephktcheung/pdf into css

Conflicts:
	client/views/anythings/show.html
	client/views/dinners/show.html
	client/views/presents/show.html