linking issue
Merge branch 'master' of https://github.com/sumantmurke/AirBox

Conflicts:

target/m2e-wtp/web-resources/META-INF/maven/com.sumant.rest/AirBox/pom.p
roperties