merge latest code

.gitignore

@@ -1,82 +1,82 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-scaffold/dist
-scaffold/dev
-scaffold/tmp
-scaffold/css/
-tenant/dist
-tenant/css
-
-# dependencies
-scaffold/node_modules
-scaffold/bower_components
-tenant/node_modules 
-
-# IDEs and editors
-.idea
-pilotage/.idea
-scaffold/.idea
-.idea/*
-pilotage/.idea/*
-scaffold/.idea/*
-
-
-scaffold/.project
-scaffold/.classpath
-scaffold/*.launch
-scaffold/.settings/
-
-# misc
-scaffold/.sass-cache
-scaffold/connect.lock
-scaffold/coverage/*
-scaffold/libpeerconnection.log
-scaffold/npm-debug.log
-scaffold/testem.log
-scaffold//typings
-tenant/npm-debug.log
-
-# e2e
-scaffold/e2e/*.js
-scaffold/e2e/*.map
-
-#System Files
-.DS_Store
-Thumbs.db
-
-
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
-
-pilotage/pilotage
-pilotage/conf
-pilotage/cert
-pilotage/log/*
-pilotage/data/*
-
-docs/_site
-docs/.sass-cache
-docs/.jekyll-metadata
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+scaffold/dist
+scaffold/dev
+scaffold/tmp
+scaffold/css/
+tenant/dist
+tenant/css
+
+# dependencies
+scaffold/node_modules
+scaffold/bower_components
+tenant/node_modules 
+
+# IDEs and editors
+.idea
+pilotage/.idea
+scaffold/.idea
+.idea/*
+pilotage/.idea/*
+scaffold/.idea/*
+
+
+scaffold/.project
+scaffold/.classpath
+scaffold/*.launch
+scaffold/.settings/
+
+# misc
+scaffold/.sass-cache
+scaffold/connect.lock
+scaffold/coverage/*
+scaffold/libpeerconnection.log
+scaffold/npm-debug.log
+scaffold/testem.log
+scaffold//typings
+tenant/npm-debug.log
+
+# e2e
+scaffold/e2e/*.js
+scaffold/e2e/*.map
+
+#System Files
+.DS_Store
+Thumbs.db
+
+
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
+
+pilotage/pilotage
+pilotage/conf
+pilotage/cert
+pilotage/log/*
+pilotage/data/*
+
+docs/_site
+docs/.sass-cache
+docs/.jekyll-metadata

CommitStyle.md

@@ -1,14 +1,14 @@
-### Commit Style
-
-Simple house-keeping for clean git history.
-Read more on [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/) or the Discussion section of [`git-commit(1)`](http://git-scm.com/docs/git-commit).
-
-1. Separate the subject from body with a blank line
-2. Limit the subject line to 50 characters
-3. Capitalize the subject line
-4. Do not end the subject line with a period
-5. Use the imperative mood in the subject line
-6. Wrap the body at 72 characters
-7. Use the body to explain what and why vs. how
-  * If there was important/useful/essential conversation or information, copy or include a reference
-8. When possible, one keyword to scope the change in the subject (i.e. "README: ...", "runtime: ...")
+### Commit Style
+
+Simple house-keeping for clean git history.
+Read more on [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/) or the Discussion section of [`git-commit(1)`](http://git-scm.com/docs/git-commit).
+
+1. Separate the subject from body with a blank line
+2. Limit the subject line to 50 characters
+3. Capitalize the subject line
+4. Do not end the subject line with a period
+5. Use the imperative mood in the subject line
+6. Wrap the body at 72 characters
+7. Use the body to explain what and why vs. how
+  * If there was important/useful/essential conversation or information, copy or include a reference
+8. When possible, one keyword to scope the change in the subject (i.e. "README: ...", "runtime: ...")