Merge pull request #1 from renepickhardt/ngrambuilder

Ngrambuilder
using theris
config.txt is anoying... about to merge develop to master
resolved conflicts in Config.java
added weights
small bug fix in smoothin
Merge branch 'master' into mysqlEvaluation
merged thomas learning of HMM weights. changed the output format to the same as pic method and included it into the evaluation framework. now we can run tests on the server with HMM weights. still need to create an evaluation framework that evaluates both weights at the same time. since it is the data base queries that are expensive
fixed a small bug in HMM learning for opening the correct file
fixed a small bug in HMM learning for opening the correct file
changed weight learner and also eval framework for evaluation of HMM
Merge branch 'mysqlEvaluation' of https://github.com/renepickhardt/typology into mysqlEvaluation