Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs/telecosystem/dao/impl/RateSettingDAO.java
	src/main/java/edu/mum/cs/telecosystem/services/RateSettingService.java
	src/main/java/edu/mum/cs/telecosystem/services/impl/RateSettingServiceImpl.java
Merge origin/master