admin.jsp and AdminAction.java
Created test jquery for providing tooltip for status type
modified description to comment for equiry

Quang
28/09/2014
updated Admin page: all new...Type.jsp adding iterators for saving
Merge branch 'master' into David
David merge with Master 28/09/2014
Created test files to test changes before implementing onto enquiry
files.
Created test jquery for providing tooltip for status type
modified description to comment for equiry

Quang
28/09/2014
Created test files to test changes before implementing onto enquiry
files.
Glassfish problems not finding .jsp's
admin.jsp and AdminAction.java
updated Admin page: all new...Type.jsp adding iterators for saving
David merge with Master 28/09/2014
Glassfish problems not finding .jsp's
commit for Quang to implement edit
Enquiry updated to accommodate changes from grabbing type service name
to type id
Merge remote-tracking branch 'origin/master' into David
Merged with Master in prep for pushing
Merge branch 'Quang' of https://github.com/IATeam/IANEW.git into Quang

Conflicts:
	IANEW/WebContent/forms/includes/summary.jsp
	IANEW/WebContent/testQuang/test.jsp
	IANEW/src/test.xml
	IANEW/src/uow/ia/action/TestAction.java
Merge branch 'David' of https://github.com/IATeam/IANEW.git into David

Conflicts:
	IANEW/WebContent/admin/advocateSettings.jsp
	IANEW/WebContent/admin/iterAccommodationTypes.jsp
	IANEW/WebContent/admin/newAccommodationType.jsp
	IANEW/WebContent/home/home.jsp
	IANEW/src/admin.xml
	IANEW/src/uow/ia/action/AdminAction.java
Updated admin.xml, AdminAction, iterAccommodationTypes.jsp and
newAccommodationType.jsp to allow editing of types.

Quang
01/10/2014