Laptops
Merge branch 'master' of https://github.com/coolmach/coolapp

Conflicts:
	src/com/cbuddy/services/AutomobileAdService.java