design, js
Merge branch 'master' of https://github.com/shams1979/temppacking

Conflicts:
	TempPacking/Scripts/temppacking.js