Merge in the JAM67 RestaurantApp into master.

Squashed commit of the following:

commit 6166703c8bc1ddb079ddc9ba6b2cfe42f46529ca
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Thu May 30 10:09:27 2013 -0400

    Fix merging

commit 830800f969dd2ad5761e496fd243c5b00de5b6b3
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Thu May 30 10:03:07 2013 -0400

    Rename the folder to that of the actual presentation name

commit 2cd48ceb6d6b8eee9f8dab8cbd0d0066848c0dae
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Thu May 30 10:01:18 2013 -0400

    Move RestaurantApp to the correct location

commit 51f54af8369c5603a194f2080234754af267f476
Merge: dca150b b7e653f
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Thu May 30 10:00:36 2013 -0400

    Merge branch 'master' of git://github.rim.net/jonross/AppIn60Minutes into restaurantApp

    Conflicts:
    	README.md

commit b7e653f00b3e00d0d9e2837dadc40f1b869e3da1
Merge: 06d9bbc c3c551e
Author: jonross <jonross@blackberry.com>
Date:   Fri May 10 09:56:38 2013 -0400

    Merge pull request #1 from rwallace/master

    adding license headers and missing license file

commit c3c551e632b53d1910f6895f4deabce5ff95e688
Author: Richard Wallace <rwallace2@rim.com>
Date:   Fri May 10 09:53:48 2013 -0400

    Adding license headers and LICENSE file

commit 06d9bbcd33a4543ebdfda508012fedc57edb5f82
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Thu May 9 13:49:38 2013 -0400

    Add a Keyboard Shortcut

commit a12c9f28e227123053ccfc5b0403593099019283
Merge: ff51b8a 7f45b64
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue May 7 12:46:20 2013 -0400

    Merge remote-tracking branch 'origin/image_page'

commit 7f45b64e23a2941e4f21c7aad544cbf26c94a927
Merge: 3d8e1fb 58469d6
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue May 7 12:45:47 2013 -0400

    Merge remote-tracking branch 'origin/menu_page' into image_page

    Conflicts:
    	RestaurantApp/assets/.assets.index

commit 58469d6aebb54c8d20f2cc349eb70ea391b66e97
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue May 7 12:40:15 2013 -0400

    Make it generic share

commit 3d8e1fb1d0f76875577ce9eb2056d9d7a84bd952
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue May 7 09:47:42 2013 -0400

    fix merge

commit c223976726f00fc1adc985d8fa9f4b05bebbb2b0
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue May 7 09:34:36 2013 -0400

    Fix merge issues

commit 9b362adac85884d6592e8c4982974f54c082b78a
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue May 7 09:30:56 2013 -0400

    Fix merge, remove newer stuff

commit ff51b8ad97c3f7f5eb102f3579530384afb1adba
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 16:53:01 2013 -0400

    Cleanup

commit 827984cd7e87f379cb381890b43083a3264fbf47
Merge: 03b5489 ed7e4b0
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 16:46:46 2013 -0400

    Merge remote-tracking branch 'origin/master' into menu_page

    Conflicts:
    	RestaurantApp/assets/.assets.index
    	RestaurantApp/assets/ItemPage.qml
    	RestaurantApp/assets/bongos.xml
    	RestaurantApp/assets/china3.xml
    	RestaurantApp/assets/data.xml
    	RestaurantApp/assets/falafel.xml
    	RestaurantApp/assets/hawks.xml
    	RestaurantApp/assets/main.qml
    	RestaurantApp/assets/mambellas.xml
    	RestaurantApp/assets/mikado.xml
    	RestaurantApp/assets/phohoa.xml
    	RestaurantApp/assets/planet.xml
    	RestaurantApp/assets/raglan.xml
    	RestaurantApp/assets/sleuths.xml
    	RestaurantApp/assets/solaris.xml
    	RestaurantApp/assets/vietgarden.xml

commit ea570019ca3a813d228ba411128fff467bf5ff2f
Merge: e3d7461 ed7e4b0
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 16:44:24 2013 -0400

    Merge remote-tracking branch 'origin/master' into image_page

    Conflicts:
    	RestaurantApp/assets/.assets.index

commit ed7e4b07a66145a36ba2c6a1341436cd1b1c6c26
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 16:40:25 2013 -0400

    These were missed somehow

commit 175b7d1eb401c63b58b9456d227ead447ad804d8
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 16:31:17 2013 -0400

    Update based on new script

commit 03b5489041f84a67069baecdc37f32694bf4bc61
Merge: 69b86b2 d5ff934
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 14:29:48 2013 -0400

    Merge remote-tracking branch 'origin/restaurants_details' into menu_page

    Conflicts:
    	RestaurantApp/assets/.assets.index
    	RestaurantApp/assets/bongos.xml
    	RestaurantApp/assets/china3.xml
    	RestaurantApp/assets/falafel.xml
    	RestaurantApp/assets/hawks.xml
    	RestaurantApp/assets/mikado.xml
    	RestaurantApp/assets/planet.xml
    	RestaurantApp/assets/raglan.xml
    	RestaurantApp/assets/restaurants.xml
    	RestaurantApp/assets/solaris.xml

commit e3d7461227092d0611bed3bb89f2befc2bc4dc7a
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 14:26:37 2013 -0400

    NDK cleanup

commit abf5f077d03cf79d975e00523dd7851e880ebcef
Merge: 887f6bb d60ad3e
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 14:24:07 2013 -0400

    Merge remote-tracking branch 'origin/master' into image_page

    Conflicts:
    	RestaurantApp/assets/.assets.index

commit 887f6bbc0c46c3308ff44674a9e251d2051b7698
Merge: 0f35730 d5ff934
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 14:23:00 2013 -0400

    Merge remote-tracking branch 'origin/restaurants_details' into image_page

    Conflicts:
    	RestaurantApp/assets/.assets.index
    	RestaurantApp/assets/bongos.xml
    	RestaurantApp/assets/china3.xml
    	RestaurantApp/assets/falafel.xml
    	RestaurantApp/assets/hawks.xml
    	RestaurantApp/assets/mikado.xml
    	RestaurantApp/assets/planet.xml
    	RestaurantApp/assets/raglan.xml
    	RestaurantApp/assets/restaurants.xml
    	RestaurantApp/assets/solaris.xml

commit d5ff93412f272ffd60e40da11778979b5010ee0b
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 14:18:25 2013 -0400

    NDK update of indices

commit 6422c5175915816f8287d66a5a97d10bbe04580c
Merge: 85c9850 3607ac7
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 14:17:30 2013 -0400

    Merge remote-tracking branch 'origin/initial_project' into restaurants_details

    Conflicts:
    	RestaurantApp/assets/.assets.index
    	RestaurantApp/assets/bongos.xml
    	RestaurantApp/assets/china3.xml
    	RestaurantApp/assets/falafel.xml
    	RestaurantApp/assets/hawks.xml
    	RestaurantApp/assets/mikado.xml
    	RestaurantApp/assets/planet.xml
    	RestaurantApp/assets/raglan.xml
    	RestaurantApp/assets/restaurants.xml
    	RestaurantApp/assets/solaris.xml

commit 3607ac78ee080496c214a4439f814180d03b5d6a
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Mon May 6 14:14:12 2013 -0400

    Indices updated by NDK

commit a189fb68505b85cb11eb6899ca21a93276f88532
Author: Anthony Hu <anhu@rim.com>
Date:   Thu May 2 13:53:12 2013 -0400

    Added info for 3 more restaurants.

    Pho Hoa, Sleuths, Viet Garden.

commit 1d80a77d6e015def6af463b86e9628ac9ba55bd2
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Wed May 1 17:05:13 2013 -0400

    Add Restaurant icons to list

    Conflicts:
    	RestaurantApp/assets/main.qml

commit 888e1bdfe3e4578cc790f4ecbffa928f33e02a11
Author: Anthony Hu <anhu@rim.com>
Date:   Wed Apr 17 11:45:20 2013 -0400

    changing weird appostrophe's to normal ones.

commit bf6500f5e8b62ac4902794940427d66964ea75f6
Author: Anthony Hu <anhu@rim.com>
Date:   Wed Apr 17 10:24:29 2013 -0400

    Added mambellas as a restaurant.

    ...just for kicks.

commit 0512ee8d6bbef6901d91e8ad97a6ee9899408ff3
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue Apr 16 14:56:46 2013 -0400

    Load menu images based on xml

    Conflicts:
    	RestaurantApp/assets/.assets.index
    	RestaurantApp/assets/Menu.qml

commit 4deff96c420352b3641777b8677c79488fcc3948
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Thu May 2 11:39:36 2013 -0400

    Rename data to match wizard creation name

    Conflicts:
    	RestaurantApp/assets/.assets.index

commit d60ad3e256197e7d5de86c8cf62dc642c9f8cfa8
Author: Anthony Hu <anhu@rim.com>
Date:   Thu May 2 13:53:12 2013 -0400

    Added info for 3 more restaurants.

    Pho Hoa, Sleuths, Viet Garden.

commit f726a8bceef34630f5d25eedba56ffcca632490c
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Thu May 2 11:39:36 2013 -0400

    Rename data to match wizard creation name

commit d26d04756688033b3405b14268076388de60a9b1
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Wed May 1 17:05:13 2013 -0400

    Add Restaurant icons to list

commit 1fa066c841f7007c82c25ddbebdb345b87e4234b
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Thu Apr 18 16:06:56 2013 -0400

    Remove unneeded ids

commit 30dbb25781d5b420ec62ae7d5083086cf9ff7e20
Author: Michael Nanni <mnanni@rim.com>
Date:   Wed Apr 17 17:17:28 2013 -0400

    Clean up image page and center content.

commit 0d9c2774d15d822180e547bb7c96ebc1edd5bd1b
Author: Anthony Hu <anhu@rim.com>
Date:   Wed Apr 17 11:45:20 2013 -0400

    changing weird appostrophe's to normal ones.

commit 66f4c9d5fd9facbabd162350f6db64835550da2b
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Wed Apr 17 11:44:34 2013 -0400

    Remove Sharing of images

commit a58fe9e76d940eb1deeebba75de1ec3d361e94ca
Author: Anthony Hu <anhu@rim.com>
Date:   Wed Apr 17 10:24:29 2013 -0400

    Added mambellas as a restaurant.

    ...just for kicks.

commit 71a194fd807aa7e61f593889c55645449f31f02f
Merge: b3918ab 0f35730
Author: Michael Nanni <mnanni@rim.com>
Date:   Tue Apr 16 17:20:08 2013 -0400

    Merge branch 'master' of github.rim.net:jonross/AppIn60Minutes

commit b3918ab65ea764cc3b468a26f7a529e47c112808
Author: Michael Nanni <mnanni@rim.com>
Date:   Tue Apr 16 17:19:34 2013 -0400

    Add context menu to restaurant menu page. Will invoke BBM

commit be77bf208ab77ee394e943c1fcbffd6e81442a06
Author: Michael Nanni <mnanni@rim.com>
Date:   Tue Apr 16 17:18:56 2013 -0400

    Add context menu to main page. Will invoke BBM

commit 0f357306893a6917f8eee005fe0957dd1367d866
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue Apr 16 14:56:46 2013 -0400

    Load menu images based on xml

commit 69b86b23fc0b773d4fe581ccb75cfd06f89c3456
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue Apr 16 14:12:43 2013 -0400

    NDK auto-cleanup

commit dbf978e2310714af7b571df448358d7d4cf26015
Author: Anthony Hu <anhu@rim.com>
Date:   Tue Apr 16 11:31:20 2013 -0400

    actually adding the menu info

commit ffa8fc9299d178dd0884a726686fad912447ae85
Author: Anthony Hu <anhu@rim.com>
Date:   Mon Apr 15 15:34:08 2013 -0400

    Removed fake restaurant data and added "real" data

    Conflicts:
    	RestaurantApp/assets/.assets.index

commit 2e9fc2df3bc506f9997731c3ba9d1870f692ef70
Author: Bob Roth <roroth@rim.com>
Date:   Mon Apr 15 13:59:15 2013 -0400

    Changes for expanded XML format

commit 85c98501b15d027430c8eac2067de98899b067c0
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue Apr 16 14:02:06 2013 -0400

    NDK cleanup of the assets folder

commit 7578ab04dce4e01f9e56976965ba427f6c5a9af4
Author: Anthony Hu <anhu@rim.com>
Date:   Tue Apr 16 11:31:20 2013 -0400

    actually adding the menu info

commit 0e47cd4c6ce9ae849df67b911e449e1e1b205fed
Author: Anthony Hu <anhu@rim.com>
Date:   Mon Apr 15 15:34:08 2013 -0400

    Removed fake restaurant data and added "real" data

    Conflicts:
    	RestaurantApp/assets/.assets.index

commit 4c3248848879ae39b4e6c31d71fdd07d49573aa9
Author: Bob Roth <roroth@rim.com>
Date:   Mon Apr 15 13:59:15 2013 -0400

    Changes for expanded XML format

commit 432d59d9486d5206e58e4c2236a81816c188e037
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue Apr 16 11:57:04 2013 -0400

    Further asset index cleanup by system

commit e5fbe088c04e8142ac701dd82299ab29a4d3999d
Author: Anthony Hu <anhu@rim.com>
Date:   Tue Apr 16 11:31:20 2013 -0400

    actually adding the menu info

commit 1e39e096c5f15308aa8f12aba5b378c06a5baf5c
Author: Anthony Hu <anhu@rim.com>
Date:   Mon Apr 15 15:34:08 2013 -0400

    Removed fake restaurant data and added "real" data

    Conflicts:
    	RestaurantApp/assets/.assets.index

commit 70a9d80109704d6c44ec0dfcadbca9c590687c4d
Author: Bob Roth <roroth@rim.com>
Date:   Mon Apr 15 13:59:15 2013 -0400

    Changes for expanded XML format

    Conflicts:
    	RestaurantApp/assets/.assets.index
    	RestaurantApp/assets/RestaurantDetails.qml

commit 7f24e4ed54f2906eea4b29d5fef83a2c399313ca
Author: Anthony Hu <anhu@rim.com>
Date:   Tue Apr 16 11:31:20 2013 -0400

    actually adding the menu info

commit 0f3423eb70b5158d4018f95cef0c33647016053c
Author: Anthony Hu <anhu@rim.com>
Date:   Mon Apr 15 15:34:08 2013 -0400

    Removed fake restaurant data and added "real" data

commit acd1bb28eda5d2de32e2caae2ea6e12f6257e310
Author: Bob Roth <roroth@rim.com>
Date:   Mon Apr 15 13:59:15 2013 -0400

    Changes for expanded XML format

commit 18addf306db10bf5ccf80891410e4970a31fb524
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Fri Apr 12 13:54:03 2013 -0400

    Cleanup unneeded code

commit 8b60ca62d16188ccc40b85d693231a00392d040c
Merge: 05c4809 f6261c8
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Fri Apr 12 10:30:41 2013 -0400

    Merge in Nanni's cleanup with my share code

commit 05c480932eea54726e0f4fc69be9929e00dd6164
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Fri Apr 12 10:08:39 2013 -0400

    Image sharing

commit f6261c8a35ca02b5c7b2203d71e957eee79c4a81
Author: Michael Nanni <mnanni@rim.com>
Date:   Thu Apr 11 18:52:12 2013 -0400

    Clean up image scroll view page code

commit 3fc699c4a3b72eba7099928c980010d4d69d6ae8
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Thu Apr 11 16:39:55 2013 -0400

    Add an image

    Added an image to test the imagescrollview. The page is now fired from
    the Menu.qml. Currently the same image for each item. Also added an
    InvokeActionItem to Share the image.

commit db4bca57cf6b30309c5b599788fe9b236e0266ca
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Thu Apr 11 10:20:10 2013 -0400

    Bring in ImageScrollView for future usage

commit c1fd3b32584ad616a001a08abc5474a575e80191
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue Apr 9 14:32:28 2013 -0400

    Add Menu view

commit d890873958c2cf71496b3975eb968f84d267a61a
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue Apr 9 14:12:00 2013 -0400

    Create Restaurant Details page

commit c84201d59ef6b97781fa0d0f031aec28da860ec7
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue Apr 9 13:52:50 2013 -0400

    Create Initial Project

    Use the project wizard to initialize a list project. Slight changes to
    make it use the restaurant xml to fill in the first list

commit 76b4ab35bed8be0a393ef11ba2b849305fe7f718
Author: Jonathan Ross <jonross@blackberry.com>
Date:   Tue Apr 9 11:32:50 2013 -0400

    Updated gitignore

commit 08c0ea72c4b0f77726563ca27ea69d281f0f1f1a
Author: jonross <jonross@blackberry.com>
Date:   Tue Apr 9 11:30:53 2013 -0400

    Initial commit
Remove accidentally added .gitignore
Merge pull request #33 from jonrossbb/master

Commit of sample code for JAM 67, BlackBerry Jam Americas 2013