Merge branch 'master' into improve_app-management

author kondou <kondou@ts.unde.re>

Sun, 18 Aug 2013 10:15:22 +0000 (12:15 +0200)

committer kondou <kondou@ts.unde.re>

Sun, 18 Aug 2013 10:15:22 +0000 (12:15 +0200)
author kondou <kondou@ts.unde.re>
Sun, 18 Aug 2013 10:15:22 +0000 (12:15 +0200)
committer kondou <kondou@ts.unde.re>
Sun, 18 Aug 2013 10:15:22 +0000 (12:15 +0200)
diff --cc lib/app.php
Simple merge
diff --cc settings/js/apps.js
Simple merge
author	kondou <kondou@ts.unde.re>
	Sun, 18 Aug 2013 10:15:22 +0000 (12:15 +0200)
committer	kondou <kondou@ts.unde.re>
	Sun, 18 Aug 2013 10:15:22 +0000 (12:15 +0200)
		1	2
lib/app.php	patch \|	diff1 \|	diff2 \|	blob \| history
settings/js/apps.js	patch \|	diff1 \|	diff2 \|	blob \| history