word view working. from windows
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_word_view.xml
	src/eu/psha/etymbrute/WordViewActivity.java