nov 23,2013
Merge branch 'master' of https://github.com/gutsoul/videoplayer_app