Merge branch 'master' into development
updated about text
updated documentation page
Merge branch 'development'
Merge branch 'master' into development
Merge remote-tracking branch 'origin/ivan_0.2'
updated text
Merge branch 'development'