[fix] [setup_wizard] fiscal year fix for setup wizard
[fix] [minor] merge conflict fixed
[fix] [minor] test cases fixes
Merge branch 'master' of github.com:webnotes/erpnext
[fix] [minor] fiscal year fix
Merge pull request #1097 from akhileshdarjee/master

[fix] fiscal year fix in setup wizard