Finish V1.2V1.2.1
Merge branch 'master' into master-private
Merge branch 'master-private' into develop
Added ionformation about writing up issues and merging
Merge branch 'develop' into master-private
Merge branch 'master-private'