Deleted useless file
Merge remote-tracking branch 'origin/master'
Adding *.iml in git ignore
minor changes
Adding the adverts infrastructure
adding web server start and stop support
Introducing swagger!
Finishing swagger implementation.
switched to jetty from grizzly to load web.xml for testing as well
ignoring classes dir
Merge branch 'swagger'

Conflicts:
	build.gradle
	src/main/java/example/HelloWorld.java
	src/main/java/search/SearchAPI.java
	src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of https://github.com/gicappa/api-spike