moved html from root to users show template, updated header, post show subviews now rendering
updated activity form
..
merge master