Conflicts:
	src/main/resources/local.properties
	src/main/webapp/js/player.js
Squashed commit of the following:

commit 16a99b5e610889e458ffa887813ec8cfd0ecb20d
Author: vanstr <mihnenok@gmail.com>
Date:   Wed Jan 29 21:33:33 2014 +0200

    ProxyServlet rewrote to controller
    bo renamed to structure
    id33-tag lib minimized
    added allowed domains list for cross-domain requests via proxy

commit 3d96283df94d40ad4e279acd9bd6eb46292b0393
Author: vanstr <mihnenok@gmail.com>
Date:   Tue Jan 28 00:40:44 2014 +0200

    Created proxy servlet for ajax requests
    Refactored player.js, added method for requesting music tags
     Added https://github.com/aadsm/JavaScript-ID3-Reader libary for ID3 parsing
     Added logback

To support metadata from GDRIVE  removed HEAD request from IB3 lib