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

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

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