Refactoring#1

Open

kenjyoung wants to merge 5 commits intodfserrano:masterfrom

hazelybell:master

Commits on Feb 25, 2015

Refactoring
Joshua Charles Campbell
committed

Commits on Oct 26, 2015

Port to Andoid Studio
joshua2ua
committed

Commits on Oct 27, 2015

fix ES demo... kind of it still doesn't actually display any movies
joshua2ua
committed
fix nothing-shows-up bug
joshua2ua
committed
Files I forgot to add
joshua2ua
committed