Conflict resolve for log.roo
Merge conflic resolve for src/main/java/com/torm/domain/* and src/main/resources/META-INF/spring/applicationContext-security.xml
Merge branch 'master' of github.com:rodel1992/qms
Fix conflicts
Merge branch 'master' of github.com:rodel1992/qms
Merge branch 'master' of github.com:rodel1992/qms
resolve conflicts