Merge branch 'master' into issue#256_js_promises

Conflicts:
	src/rockstor/storageadmin/static/storageadmin/js/views/add_pool.js
Merge branch 'issue#256_js_promises' of github.com:Mchakravartula/rockstor-core into issue#256_js_promises

Conflicts:
	src/rockstor/storageadmin/static/storageadmin/js/views/add_pool.js
Correct spelling for rockstor layout view and inplement callback for fetch.