resolved bugs, have forgotten which exactly
Merge branch 'master' of github.com:nanakay/gcdcApp