added recommendationfragment and fixed some layouts
Merge branch 'master' into psuedo_master
Merge branch 'psuedo_master'