tree fab0e8dd2c71a46d91b974ef84dc266ccfbec089
parent 998e465dc60274563800d88770080b2a1b1b1b50
parent 3bef47adc4386322226a4b01340438e065e404bd
author Matteo Scandolo <teo@onlab.us> 1454017303 -0800
committer Matteo Scandolo <teo@onlab.us> 1454017303 -0800

Merge branch 'master' into feature/serviceTopology

# Conflicts:
#	views/.yo-rc.json
#	views/README.md
#	views/ngXosLib/README.md
#	views/ngXosLib/xosHelpers/src/services/csrfToken.interceptor.js