Multiple Asset Uploads and Categories

https://www.pivotaltracker.com/story/show/77137100

![image](https://cloud.githubusercontent.com/assets/486358/5116669/f4785b22-7000-11e4-930c-3524644a4a7c.png)