Merge branch 'master' of https://github.com/bg95/WhitePigeon into Pt-Cr
version 2013.9.15
version for presentation
still debugging dll
Merge branch 'lazine' of https://github.com/bg95/WhitePigeon into Pt-Cr

Conflicts:
	WhitePigeon.pro
	musicshower/musicbaritem.cpp
	musicshower/musicbaritem.h
	musicshower/musicrepeatitem.cpp
	musicshower/musicrowitem.cpp
	musicshower/musicscene.cpp
	musicshower/musicscene.h
	musicshower/musictextitem.cpp
	musicshower/musictextitem.h
	musicshower/musicview.cpp
	musicshower/musicview.h