Increase the expire of access tokens
Merge branch 'master' of https://github.com/ashihaby/apis

Conflicts:
	apis-authorization-server-war/src/main/resources/db/migration/hsqldb_content/V1__auth-server-admin.sql