Merge
Merge branch 'tablet' of https://github.com/fapereira1/make-a-wish into
tablet

Conflicts:
	src/main/java/com/ciandt/hackathon/config/GuiceServletConfig.java
remove unused class