Merge branch 'develop' of /Users/Stefan/Documents/KP-Biotec/comprot-frontend with conflicts.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	bower.json
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
UI: home jumbotron, breadcrumbs and drug table
UI: drug and protein details
UI: filter ui prototyp