tabbar, subtab, control, navbar
Merge branch 'master' of https://github.com/letsdoitworld/ldiw-iphone2

Conflicts:
	Ldiw/AppDelegate.m