Skip changes

08.09.2014 3:06 pm
Merge remote-tracking branch 'origin/master'

Conflicts:
	next_steps.php
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 4293d3ccb4541955e8cb33c1bba13b5c9f7245f5.