code refactoring
Merge branch 'master' of https://github.com/cristeab/TabletReaderWin8

Conflicts:
	src/pageprovider.h