Merge pull request #1 from XperiaL-CM/master

update proprietary-files.txt
remove FM
huge updates
remove huashan stuff
remove un-needed files
Merge pull request #2 from XperiaL-CM/cm-11.0

Cm 11.0 merge into master