Http Session bug fixed
Merge branch 'searchappdemo' of https://github.com/Immanent/SearchApp into searchappdemo

Conflicts:
	src/com/immanent/user/ContactSearch.java
	src/com/immanent/user/Friendlist.java