Modifications in edit campaign and entities.
Merge branch 'master' of https://github.com/globant/googleappengine-training

Conflicts:
	AddsIncGAE/war/WEB-INF/jsp/ProductList.jsp
add product to campaign
Merge branch 'master' of https://github.com/globant/googleappengine-training