Implementation of the picture upload, incorporation of google maps in search page, and modification of user profile page layout
Resolution of conflicts arising from search functionality between Nik and SOlomon's branches
initial integration of the search functionality from Nik's place search
Merge branch 'master' of github.com:soloz/socnav
picture upload works, still cannot update online state upon sess expiration