Location and Room Services extended. Location constructor changed.
Merge remote-tracking branch 'origin/master'

Conflicts:
	conference-service/src/main/java/com/prodyna/conference/service/RoomServiceBean.java