Merge branch 'fixes/favorite-star_not-clickable' into develop
Merge branch 'fixes/hide-page-text-on-small-devices' into develop
Merge branch 'fixes/hide-page-text-on-small-devices' into develop
Merge branch 'fixes/internationalisation-on-mobile-devices' into develop
Merge branch 'feature/configure-fixed-timeintervals' into develop
Merge branch 'fixes/reference-values-render-own-yaxis' into develop
solved merge conflict
solved merge conflict
solve merge conflict
solve merge conflicts
merge from 52n
add gh-pages to git ignore
hide page text on xs devices only
Merge remote-tracking branch '52n/develop' into develop

Conflicts:
	src/main/webapp/templates/favorites-main.html
Merge pull request #104 from ridoo/develop

sync repos