Fix linkTo calls for new routing
Fix gallery image view
Merge branch 'master' into routing

Conflicts:
	gallery/lib/tiles.php
Fix url for gallery folder nav
Transitional filter-by-category design take 1.
Merge branch 'master' of github.com:owncloud/apps into vcategories_db
Use category format const.
Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Merge branch 'master' of github.com:owncloud/apps into vcategories_db
Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Merge branch 'master' of github.com:owncloud/apps into vcategories_db
Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Use types (event/contact) instead of app names for vcategories. Also purge category/object relations on object deletion.
Merge branch 'master' of github.com:owncloud/apps into vcategories_db
Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Merge branch 'vcategories_db' into contacts_rework
Missed one 'contacts' => 'contact' update.
First work on new Contacts js and group based UI.