ini
delete
delete
recreate
re
add Login Module
mod
mearge
update login button
update login button
mod
mod
update
delete settings
Merge branch 'master' of bitbucket.org:kirou/shinkan
mod
Merge branch 'master' of bitbucket.org:kirou/shinkan

Conflicts:
	.gitignore
mod
mod
Merge branch 'master' of bitbucket.org:kirou/shinkan