miki
Merge branch 'master' of https://github.com/zarie/apka

Conflicts:
	db/schema.rb
schema1
Merge branch 'master' of https://github.com/zarie/apka
Merge branch 'master' of https://github.com/zarie/apka
Merge branch 'master' of https://github.com/zarie/apka