marge20140521
Merge branch 'master' of https://github.com/nullzine/Komono

Conflicts:
	Komono/.idea/workspace.xml