up
Merge branch 'master' of github.com:naibaf7/LinguaAdHoc

Conflicts:
	LinguaAdHoc/src/ch/smartapes/linguaadhoc/android/ClassifierReader.java