bumped version number in style.css
Merge branch 'base-1-1' into buddypress-1-1

Conflicts:
	style.css