relase 2 changes in code stan
resolving conflict
Merge branch 'r2_codingstan'