Merge branch 'master' of github.com:mariossotir13/msOAuth-php

Conflicts:
	nbproject/project.properties
	src/Ms/OauthBundle/Component/Authorization/AuthorizationErrorResponse.php
	src/Ms/OauthBundle/Component/Authorization/AuthorizationRequest.php
	src/Ms/OauthBundle/Controller/AuthorizationController.php
	src/Ms/OauthBundle/Controller/RegistrationController.php
	src/Ms/OauthBundle/Form/Type/ClientType.php
	src/Ms/OauthBundle/Resources/views/Authorization/invalid_request_page.html.twig

Signed-off-by: Marios Sotiropoulos <mai1211@uom.edu.gr>