added admin controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	Skillmatcher1/target/Skillmatcher-1.0-SNAPSHOT.war
	Skillmatcher1/target/maven-archiver/pom.properties