test merge
Merge branch 'master' of https://github.com/streetcoder/NextGen-Theme
testimerge
Conflicts:
	index.php