Merge pull request #33 from kheang/master

handled conflict
working on account view
Merge https://github.com/lunchpad/lunchpad.us
merging
account#update test
Merge pull request #35 from kheang/master

temporarily removed strong params from query
Merge pull request #36 from deedeelavinder/master

account#update and test
temporarily removed strong params from test for query
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us