Merge branch 'master' of https://github.com/reign7/r7dev2

Conflicts:
	wp-config.php
ignore wp-config