Working on uploads...
Basic saving working.
Merge branch 'master' of github.com:craftsmancoding/assetmanager

Conflicts:
	composer.json