add shamu to lunch menu

Change-Id: Ib0bb63fb63c9a56dc972d5f3b88d10b204d50f84
Merge "add shamu to lunch menu" into lp5.0
Fix version string

Change-Id: If9630fab7c86ced61828c79092dde0eeaee2244e
push up version to 0.7

next alpha release

Change-Id: Icfd6541effff76e22ed6a1e67cdedf50ea8b8bff
Merge remote-tracking branch 'Slim/lp5.0' into lp5.0

Conflicts:
	config/common.mk