sync
Merge branch 'develop' of https://github.com/ruhee/hackathon into develop

Conflicts:
	Visualizr/Visualizr.xcodeproj/project.pbxproj
ignore