2014-08-21
Merge branch 'master' of https://github.com/naka-shin/Baukis

Conflicts:
	log/development.log
Delete app/app
Merge branch 'master' of https://github.com/naka-shin/Baukis

Conflicts:
	log/development.log