Add upload on the create album popup
Merge branch 'develop' of http://github.com/nemolovich/MSM.git into develop