conflicts on pom
Merge branch 'master' of https://github.com/maxsap/Restfull-Pickelink-Angular.js

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/maxsap/Restfull-Pickelink-Angular.js
something
updated rest to follow test paradigm, front end needs to read and store x-auth-token from servers response.