few little bugs
Merge branch 'development' into qa
fixed bug with verification date
Merge branch 'qa' of github.com:reharik/MethodFitness into qa