Updated to Qualia 1.3.0
Merge branch 'master' of https://github.com/Elixel/qualia-app

Conflicts:
	.DS_Store