check total attachment in discipline case
disable ugly template warning message
Merge branch 'master' into deployed-2014