Merge branch 'cyanogenmod' into cm-10.2

Conflicts:
	BoardConfig.mk
	p1ln.sh
	proprietary-files.txt