Merge branch 'master' of github.com:telephonebilling/tbs

Conflicts:
	tbs/src/main/java/mum/cs490/tbs/controller/UserBean.java
	tbs/src/main/java/mum/cs490/tbs/dao/impl/CallDetailDao.java
	tbs/src/main/webapp/pages/traffic_summary.xhtml
Merge branch 'master' of github.com:telephonebilling/tbs

Conflicts:
	tbs/src/main/java/mum/cs490/tbs/controller/UserBean.java
	tbs/src/main/java/mum/cs490/tbs/dao/impl/CallDetailDao.java
	tbs/src/main/webapp/pages/traffic_summary.xhtml
Merge branch 'master' of github.com:telephonebilling/tbs

Conflicts:
	tbs/src/main/java/mum/cs490/tbs/controller/UserBean.java