Added a map
Merge branch 'master' of https://github.com/Team31/Mojio

Conflicts:
	Mojio/Frank/features/login.feature
	Mojio/Frank/features/my_first.feature
	Mojio/Frank/features/step_definitions/launch_steps.rb
	Mojio/Frank/features/support/env.rb
	Mojio/Frank/frank.xcconfig
	Mojio/Frank/frank_static_resources.bundle/ViewAttributeMapping.plist
	Mojio/Frank/frank_static_resources.bundle/ViewAttributeMappingMac.plist
	Mojio/Frank/frank_static_resources.bundle/images/ajax-loader.gif
	Mojio/Frank/frank_static_resources.bundle/images/file.gif
	Mojio/Frank/frank_static_resources.bundle/images/folder-closed.gif
	Mojio/Frank/frank_static_resources.bundle/images/folder.gif
	Mojio/Frank/frank_static_resources.bundle/images/loader.gif
	Mojio/Frank/frank_static_resources.bundle/images/loader.png
	Mojio/Frank/frank_static_resources.bundle/images/minus.gif
	Mojio/Frank/frank_static_resources.bundle/images/plus.gif

Mojio/Frank/frank_static_resources.bundle/images/treeview-black-line.gif
	Mojio/Frank/frank_static_resources.bundle/images/treeview-black.gif

Mojio/Frank/frank_static_resources.bundle/images/treeview-default-line.g
if
	Mojio/Frank/frank_static_resources.bundle/images/treeview-default.gif

Mojio/Frank/frank_static_resources.bundle/images/treeview-famfamfam-line
.gif
	Mojio/Frank/frank_static_resources.bundle/images/treeview-famfamfam.gif
	Mojio/Frank/frank_static_resources.bundle/images/treeview-gray-line.gif
	Mojio/Frank/frank_static_resources.bundle/images/treeview-gray.gif
	Mojio/Frank/frank_static_resources.bundle/images/treeview-red-line.gif
	Mojio/Frank/frank_static_resources.bundle/images/treeview-red.gif
	Mojio/Frank/frank_static_resources.bundle/index.html
	Mojio/Frank/frank_static_resources.bundle/index.html.haml

Mojio/Frank/frank_static_resources.bundle/js/accessible_views_view.coffe
e
	Mojio/Frank/frank_static_resources.bundle/js/accessible_views_view.js
	Mojio/Frank/frank_static_resources.bundle/js/controller.coffee
	Mojio/Frank/frank_static_resources.bundle/js/controller.js
	Mojio/Frank/frank_static_resources.bundle/js/details_view.coffee
	Mojio/Frank/frank_static_resources.bundle/js/details_view.js
	Mojio/Frank/frank_static_resources.bundle/js/dropdown_control.coffee
	Mojio/Frank/frank_static_resources.bundle/js/dropdown_control.js
	Mojio/Frank/frank_static_resources.bundle/js/ersatz_model.coffee
	Mojio/Frank/frank_static_resources.bundle/js/ersatz_model.js
	Mojio/Frank/frank_static_resources.bundle/js/ersatz_view.coffee
	Mojio/Frank/frank_static_resources.bundle/js/ersatz_view.js

Mojio/Frank/frank_static_resources.bundle/js/experiment_bar_model.coffee
	Mojio/Frank/frank_static_resources.bundle/js/experiment_bar_model.js
	Mojio/Frank/frank_static_resources.bundle/js/experiment_bar_view.coffee
	Mojio/Frank/frank_static_resources.bundle/js/experiment_bar_view.js
	Mojio/Frank/frank_static_resources.bundle/js/frank.coffee
	Mojio/Frank/frank_static_resources.bundle/js/frank.js
	Mojio/Frank/frank_static_resources.bundle/js/lib/backbone.js
	Mojio/Frank/frank_static_resources.bundle/js/lib/coffee-script.js
	Mojio/Frank/frank_static_resources.bundle/js/lib/jquery-ui.min.js
	Mojio/Frank/frank_static_resources.bundle/js/lib/jquery.min.js
	Mojio/Frank/frank_static_resources.bundle/js/lib/jquery.treeview.js
	Mojio/Frank/frank_static_resources.bundle/js/lib/json2.js
	Mojio/Frank/frank_static_resources.bundle/js/lib/raphael.js
	Mojio/Frank/frank_static_resources.bundle/js/lib/require.js
	Mojio/Frank/frank_static_resources.bundle/js/lib/underscore.js
	Mojio/Frank/frank_static_resources.bundle/js/main.coffee
	Mojio/Frank/frank_static_resources.bundle/js/main.js
	Mojio/Frank/frank_static_resources.bundle/js/tabs_controller.coffee
	Mojio/Frank/frank_static_resources.bundle/js/tabs_controller.js
	Mojio/Frank/frank_static_resources.bundle/js/toast_controller.coffee
	Mojio/Frank/frank_static_resources.bundle/js/toast_controller.js
	Mojio/Frank/frank_static_resources.bundle/js/transform_stack.coffee
	Mojio/Frank/frank_static_resources.bundle/js/transform_stack.js
	Mojio/Frank/frank_static_resources.bundle/js/tree_view.coffee
	Mojio/Frank/frank_static_resources.bundle/js/tree_view.js
	Mojio/Frank/frank_static_resources.bundle/js/view_hier_model.coffee
	Mojio/Frank/frank_static_resources.bundle/js/view_hier_model.js
	Mojio/Frank/frank_static_resources.bundle/js/view_model.coffee
	Mojio/Frank/frank_static_resources.bundle/js/view_model.js
	Mojio/Frank/frank_static_resources.bundle/pictos/index.html
	Mojio/Frank/frank_static_resources.bundle/pictos/pictos-web.eot
	Mojio/Frank/frank_static_resources.bundle/pictos/pictos-web.svg
	Mojio/Frank/frank_static_resources.bundle/pictos/pictos-web.ttf
	Mojio/Frank/frank_static_resources.bundle/pictos/pictos-web.woff
	Mojio/Frank/frank_static_resources.bundle/pictos/pictos.css
	Mojio/Frank/frank_static_resources.bundle/pictos/pictos_base64.css
	Mojio/Frank/frank_static_resources.bundle/stylesheets/css/symbiote.css

Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_elements.scs
s
	Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_header.scss

Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_inspect_tabs
_list_tabs.scss

Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_jquery.treev
iew.scss
	Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_jqui.scss
	Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_layout.scss
	Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_mixins.sass
	Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_reset.scss

Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_selector_tes
t_toolbar.scss

Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_solarized.sc
ss

Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_typography.s
css

Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_unicode.scss

Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/_z_index.scss

Mojio/Frank/frank_static_resources.bundle/stylesheets/sass/symbiote.scss
	Mojio/Frank/frankify.xcconfig
	Mojio/Frank/libCocoaAsyncSocket.a
	Mojio/Frank/libCocoaAsyncSocketMac.a
	Mojio/Frank/libCocoaHTTPServer.a
	Mojio/Frank/libCocoaHTTPServerMac.a
	Mojio/Frank/libCocoaLumberjack.a
	Mojio/Frank/libCocoaLumberjackMac.a
	Mojio/Frank/libFrank.a
	Mojio/Frank/libFrankMac.a
	Mojio/Frank/libShelley.a
	Mojio/Frank/libShelleyMac.a
	Mojio/Mojio.xcodeproj/project.xcworkspace/xcshareddata/Mojio.xccheckout
	Mojio/Mojio/Base.lproj/Main_iPhone.storyboard