Added media control buttons
Merged db changes
Updated gitignore