Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs/telecosystem/controllers/RateSheetsController.java
Merge origin/master