Basic Library Functionality
Audio Library Enhancement
Audio library enhancement
Audio library enhancement
fix
conflict resolve
merging conflicts...
Merge pull request #15 from adya/master

Release I (Part 1)
Audio library enhancement
new icons
Merge branch 'master' of https://github.com/adya/YAMP into adya-master
conflicts resolving
Refactoring and basic playlists logic
small fix
AudioLibraryManager refactorings and playlist adding functionality
Merge branch 'master' of git://github.com/VAlux/YAMP

Conflicts:
	YAMPProject/YAMP/src/main/java/com/yamp/core/PlayerMainActivity.java
	YAMPProject/YAMP/src/main/res/layout/activity_main.xml