Some changes
Merge branch 'master' of https://github.com/ithillel/MyCity.git

Conflicts:
	MyCity/src/org/hillel/it/mycity/model/entity/NightClub.java
Merge branch 'master' of https://github.com/ithillel/MyCity.git

Conflicts:
	MyCity/src/org/hillel/it/mycity/persistence/repository/inmemory/InMemoryUserRepository.java