updated conflicts
Merge branch 'master' of https://github.com/whyu/PoolParty
set default values in user edit form
Merge branch 'master' of https://github.com/whyu/PoolParty
put create trip in a table
adding gravatar module helper