profile prelim fixes
Merge branch 'master' of https://github.com/DaniyalKhan/FuelCell

Conflicts:
	gen/com/fuelcell/R.java