updated to MR2
Merge branch 'master' of https://github.com/mrimp/infamous_aokp_build_script

Conflicts:
	infamous_aokp_build.sh