---
Merge branch 'develop' of github.com:anastasiacrs/StartApp into develop
delete nb-conf
add checkstyle
Merge branch 'develop' of github.com:anastasiacrs/StartApp into develop