Local DEV configuration
Merge branch 'master' of https://github.com/BigStarUa/MusicBox

Conflicts:
	ua.mamamusic.mamamusicBox.rcp.spring/src/applicationContext.xml
Blind merge fix
Working on FilteredTree
Aspect frame (XML Based)
Track and Album in progress
False copy removed
Merge branch 'masterNew' of https://github.com/BigStarUa/MusicBox.git into AspectLog

Conflicts:
	ua.mamamusic.mamamusicBox.rcp.spring/META-INF/spring/client-beans.xml
	ua.mamamusic.mamamusicBox.rcp.spring/src/applicationContext.xml
	ua.mamamusic.mamamusicBox.rcp/src/ua/mamamusic/mamamusicBox/rcp/parts/CountryListPart.java
	ua.mamamusic.mamamusicBox.server/.classpath
	ua.mamamusic.mamamusicBox.server/.project
	ua.mamamusic.mamamusicBox.server/src/Spring-Module.xml
	ua.mamamusic.mamamusicBox.server/src/hibernate.cfg.xml
	ua.mamamusic.mamamusicBox.server/src/ua/mamamusic/mamamusicBox/server/ActionServer.java
Start Calendar
Creating Events and CalendarDay
Calendar animation
Persons
Logging subsystem prototype
Merge branch 'masterNew' of https://github.com/BigStarUa/MusicBox.git into AspectLog

Conflicts:
	ua.mamamusic.mamamusicBox.server/src/Spring-Module.xml
	ua.mamamusic.mamamusicBox.server/src/hibernate.cfg.xml
Persons 2
Merge branch 'masterNew' of https://github.com/BigStarUa/MusicBox.git into AspectLog

Conflicts:
	ua.mamamusic.mamamusicBox.server/src/Spring-Module.xml
	ua.mamamusic.mamamusicBox.server/src/hibernate.cfg.xml
add Client list in Person
Track + Album refactoring
Creating User UI
Small corrections
GUI Test