Add security management (token and session id)
Merge branch 'master' into SECURITY

Conflicts:
	bbox-secondscreen-library/gradle/wrapper/gradle-wrapper.properties
Merge branch 'SECURITY'