Merge pull request #3 from dkonurov/master

merge and add conteiner to setting
none
asd
Merge pull request #4 from dkonurov/master

wakeLock, showDialog
Merge https://github.com/cherkasovas/Ambient

Conflicts:
	res/layout/play_lists.xml
	res/layout/play_lists_editable_item.xml
	res/layout/play_lists_item.xml
	src/com/opensoftdev/ambient/PlayListsActivity.java
	src/com/opensoftdev/ambient/PlayListsAdapter.java