Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs/telecosystem/services/CustomerService.java
	src/main/java/edu/mum/cs/telecosystem/services/controller/ReportController.java
	src/main/java/edu/mum/cs/telecosystem/services/impl/CustomerServiceImpl.java
	src/main/webapp/WEB-INF/springconfig.xml
Merge origin/master