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

Conflicts:
	Akra/.classpath
	Akra/.settings/org.eclipse.jdt.core.prefs
	Akra/.settings/org.eclipse.wst.common.project.facet.core.xml
update estilos correos y estilos página after-payment