Merge branch 'master' of https://github.com/WizardFactory/BlogSyncer

Conflicts:
	public/javascripts/controller.js