Merge branch 'master' of https://github.com/Fittr/fittr into cardaction
Merge branch 'master' of https://github.com/Fittr/fittr into cardaction
Merge branch 'master' of https://github.com/Fittr/fittr into cardaction
removed drag from side-menu
Merge branch 'master' of https://github.com/Fittr/fittr into cardaction
Merge branch 'master' of https://github.com/Fittr/fittr into cardaction
made avatar circular
fixed some of the display data in topBar, but incomplete data returned with curr route
add all changes
merge
Merge pull request #68 from sudostack/cardaction

Cardaction - round avatars
test fix
merge
Merge pull request #70 from Hendrixer/master

added all changes, same as heroku