updates for #SSEER-14
stupid conflict
adding files for #SSEER-14
Merge pull request #1082 from Tendrid/develop

#SSEER-14