Finished price.php
Cleanliness
Merge branch 'master' of https://github.com/guywithnose/fuzzy-octo-bear
Clean up js
Merge branch 'master' of https://github.com/guywithnose/fuzzy-octo-bear
Rremove unused files
Merge branch 'master' of https://github.com/guywithnose/fuzzy-octo-bear
fix js
fix js
Merge branch 'master' of https://github.com/guywithnose/fuzzy-octo-bear

Conflicts:
	javascript/picupload.js