Added target to ignore
Updated Conflict
Merge branch 'master' of https://github.com/adi4learning/WebNG.git
Update Pom