Adding ability to edit phrases
Merge branch 'master' of https://github.com/mangini/speaknow

Conflicts:
	chromeapp/css/tellme.css
	chromeapp/index.html
	chromeapp/js/tellme.js
	mobile/platforms/android/assets/www/css/tellme.css
	mobile/platforms/android/assets/www/index.html
	mobile/platforms/android/assets/www/js/tellme.js