Cpa release
better distort check
merge
merge
Merge branch 'master' of github.com:bachelor-2014/code
Merge
12 tommer