temp
Merge branch 'master' of https://github.com/juliandramirez/akra

Conflicts:
	Akra/build/classes/com/akra/proposals/core/ProposalServices.class
	Akra/build/classes/com/akra/templates/TemplateRestFacade.class
	Akra/build/classes/com/akra/templates/TemplateServices.class
	Akra/src/com/akra/templates/TemplateServices.java