Add regex for optional route nesting to ui router
Merge branch 'feature/client-side-routing-serialize-query' of github.com:opf/openproject into feature/client-side-routing-serialize-query

Conflicts:
	app/assets/javascripts/angular/routing.js