Change in setting file for the project
change in setting file
Change in setting file in ejb
Change in setting file in ejb
Change in student file ejb
Get setting bean in ejb
Get setting bean in ejb
Change in setting page in web
change in student web
Setting bean in ejb
Web application changes due to some conflict.
Web application changes due to some conflict.
Web application changes due to some conflict.
Merge branch 'master' of https://github.com/TMReservation/TMProject

Conflicts:
	TMChecking/TMChecking-ejb/src/main/java/com/tm/student/StudentBean.java
	TMChecking/TMChecking-ejb/src/main/java/com/tm/student/StudentBeanLocal.java