Edited and Added files due to code cleaning and proper code convention and addition of the sales module
Added i18n internationalization
Merge branch 'master' of https://github.com/jdpalmares/pizzaccio

Conflicts:
	WebContent/WEB-INF/tags/genericpage.tag