Merge pull request #51 from sudostack/cardaction

Cardaction - Removed all pet stuff
api routes
test
Merge pull request #52 from Hendrixer/server

Server and stuff
fix bug
removed search; removed swipe in topBar; add user photo and dummy stats
Merge branch 'master' of https://github.com/Fittr/fittr into cardaction

Conflicts:
	public/js/src/app.js