smanager,admin settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/home.jsp
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Printing search results.
Merge remote-tracking branch 'origin/master'
Printing search results
Merge remote-tracking branch 'origin/master'