Changes as per client
Merge branch 'master' of https://github.com/sunilsp/erasik into sunil02212014

Conflicts:
	src/main/webapp/assets/js/itemDataFields.js
Merge branch 'master' of https://github.com/sunilsp/erasik into sunil02212014

Conflicts:
	src/main/webapp/html/common.html
removed some unnecessary code
Merge branch 'master' of https://github.com/sunilsp/erasik into sunil02212014
Changes for Discount percentage and price text box
Fix bugs