Fix the permission problem.
Define a type for file_type_save().
Minor fix for now.
Update media gallery to 7.x-2.x
Merge branch 'SCHOLAR-3.x' into 1690
Merge branch '1690' into 1692