#1 Verwendung sribe-java für Server, Erster Versuch bis Abfrage
access-token
#1 Einbindung scribe-java, Abfrage access-Token
Merge branches 'editView' and 'master' of https://github.com/dudolino/tutelage into editView

Conflicts:
	src/main/webapp/js/view/views.js
Merge branches 'editView' and 'master' of https://github.com/dudolino/tutelage into editView

Conflicts:
	src/main/webapp/js/view/views.js