#381: Fixed tabs switching
Merge branch 'dev' into dev-nHibernate-upgrade
#351 Changed logic of loading and saving page options