new design
changes in gui
merge mel
Merge branch 'MelsBranch'

Conflicts:
	LocalBoy/LocalBoy.xcodeproj/project.pbxproj