Improve footer and contribute templates
solve uncommited changes
Merge commit 'be50435f95dae9d7f56e7e053b3165fb0c28448e' into FlashCardsTemplate

Conflicts:
	modules/flashcards/client/flashcard.coffee
	modules/flashcards/server/flashcard.coffee
	tapcards.coffee
	tapcards.html
Progression through cards complete, but not pretty yet...
contribute template
Removed old flashcard bits

Merge commit '4b13eee92f94c32bfa537f46425ba062a74a596d' into flashcard_progress

Conflicts:
	modules/flashcards/client/flashcard.html
Routes to /verify after completing 10 cards
Rejigged the verify and contribute views for simplicity
Started implementing filesystem
Schema is server side only now
Merge commit '9475c60e2a5470dbce2245bfa67baae4d9fccf1f' into profile_template

Conflicts:
	lib/routes.coffee

Fixed an issue on the profile screen where the user's native language was not being properly selected in the drop down list