current v1 into master

getting master up to current dev to have it live for demo