version bump & tabs
Merge branch 'release/1.2'
Collapsed nav fix
Merge branch 'feature/nav_refactor' into develop

Conflicts:
	css/style.css
	scss/scss/objects/_nav.scss
Version & tag update.
Merge branch 'release/1.2.1'

Conflicts:
	style.css
Cleanup
Cleanup
Better :hover state for links in content
Merge branch 'develop' of codebasehq.com:onedge/clean-contect/wp-clean-content into develop