Conflict
Merge branch 'master' of http://github.com/inska/note

Conflicts:
	String/String/String.sdf
	String/String/String/String.cpp