Refactor to simplify
Refactiring of code
Refactor to simplify
Refactor to simplify
Changes for items language and edition
Modified html files
Merge branch 'master' into HEAD

Conflicts:
	src/main/webapp/html/common.html
Merge branch 'master' of https://github.com/sunilsp/erasik

Conflicts:
	src/main/webapp/html/common.html
Merge branch 'sunil-02192014'

Conflicts:
	src/main/webapp/html/common.html