version upgrade to 3.8 from prod
Merge branch 'tbozhok' of github.com:onehopeunited/onehopeunited into tbozhok

Conflicts:
	wp-content/themes/twentyeleven/error_log
	wp-content/themes/twentytwelve/error_log
upgrade finished