bgs
Merge branch 'master' of
https://github.com/Stannisthemanis/SD_project2.git

Conflicts:
	src/meeto/sd2project/action/LoginAction.java
	src/meeto/sd2project/model/RmiBean.java
	src/rmiserver/RMIServerInterface.java