Decrease increment
Code cleanup
Add deployment scripts
Merge pull request #47 from daviskim/deploy

Deploy
Move all devDep to normal dependencies
Change grunt -> gulp
Merge pull request #48 from daviskim/braanch2

Braanch2
Update README.md
Merge branch 'master' into develop

Conflicts:
	README.md
	client/index.html
	client/upload/upload.tpl.html
	deploy.sh
Merge branch 'develop'
Update index.html
Update deploy.sh
Merge pull request #92 from mojsart/master

Merging latest staging into master