first commit from mac
commit on master
Merge branch 'master' of https://github.com/eneim/zCSN

Conflicts:
	gen/org/eneim/tempapp/R.java
	src/org/eneim/tempapp/MainActivity.java
	src/org/eneim/tempapp/parser/CSNMusicPlaylistParser.java