Add features to service
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/app.js
Merge branch 'master' of https://github.com/LookLikeAPro/flashcards

Conflicts:
	www/js/app.js
Merge branch 'master' of https://github.com/LookLikeAPro/flashcards

Conflicts:
	www/js/app.js
	www/js/service.js