Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses / src / businessLogic / AdminManager.java
2015-05-18 epinzolas001Merge conflicts solutioned
2015-05-17 camjanPossibility of registering new owners added
2015-05-16 camjanUsername is saved hashed and password hashed and salted
2015-04-15 camjanDebbugin continues...
2015-04-14 Eneko Pinzolas Muruaimports leaned
2015-04-12 Eneko Pinzolas MuruaModel modified so that owners now request for a new...