Merge branch 'master' into Joel
Merge branch 'Joel' into Ahmed
Added the SortMenuActivity manually