added ember to bower.json and changed path of lib from bower components
Merge branch 'master' of github.com:KiiCorp/KiiFlashcardApp

Conflicts:
	bower.json
Fix syntax error in bower.son
Merge branch 'master' into get-new-words