Merge pull request #1 from dirkschumacher/master

update the yippie-io repository with the current stable code
Merge pull request #2 from dirkschumacher/master

bump the yippie.io stable with some minor updates and bugfixes
Merge pull request #3 from yippie-io/master-merge

Merges current version from my repo
Merge pull request #4 from dirkschumacher/master

Code Refactorings
Merge pull request #5 from dirkschumacher/master

Minor refactorings
Merge pull request #6 from dirkschumacher/master

Course refactorings
Merge branch 'master' of https://github.com/dirkschumacher/iUPB
Merge branch 'navigator' of https://github.com/dirkschumacher/iUPB into navigator
translates a label in the navigator
fixes bug where the back arrow on navigator does not show a hand on hover
fixes a small UI bug in the navigator
some UI tweaks for the navigator
adds a new version of the navigator details view UI - metro inspired :) - though still room for improvement
Merge branch 'staging_master' into navigator

Conflicts:
	app/assets/javascripts/pages_navigator.js.coffee
	app/assets/stylesheets/pages.css.scss
Merge branch 'navigator_github' into navigator

Conflicts:
	app/assets/javascripts/pages_navigator.js.coffee
	config/locales/de.yml
	config/locales/en.yml