Mistakes handled
Merge branch 'devel' of github.com:ieee-metu/GAMApp into devel