Resolving conflicts in search_users.js
Initial commit of network new form validations.
Updating network validations. Also updating user location marker to dinosaur.
Resolving merge conflicts.
Merge branch 'master' into shehryar