This is initial commit for brance VS-FEATURE-AUTHENTICATION
Merge remote-tracking branch 'origin/master' into VS-FEATURE-AUTHENTICATION

Conflicts:
	Rekening_Administratie_Overheid/.idea/libraries/Mojarra_2_2_1.xml
	Verplaatsingen_Systeem/.idea/libraries/commons_fileupload_1_3.xml
	Verplaatsingen_Systeem/.idea/libraries/javax_ejb_api.xml
	Verplaatsingen_Systeem/.idea/workspace.xml
Fix master rebase
FIX: even more reverts to prevent breaking commits
Merge remote-tracking branch 'origin/master' into VS-FEATURE-AUTHENTICATION
Merge pull request #25 from PTS-S61E/VS-FEATURE-AUTHENTICATION

VS-FEATURE-AUTHENTICATION
Merge remote-tracking branch 'origin/master' into AS-Feature-simulatie_van_autogegevens

Conflicts:
	AutoSysteem/.idea/artifacts/AutoSysteem_war.xml
	AutoSysteem/.idea/artifacts/AutoSysteem_war_exploded.xml
	AutoSysteem/.idea/libraries/Java_EE_6_Java_EE_6.xml
	AutoSysteem/.idea/workspace.xml
	Verplaatsingen_Systeem/.idea/artifacts/Verplaatsingen_Systeem_ejb_exploded.xml
	Verplaatsingen_Systeem/.idea/workspace.xml