moved data to rootvc
refactor complete
merged with Dev2
updated
merge resolved
updated stb
added viewwillappear in listVC
refactor complete
added a MPVideoPlayerVC to video
segue cleaned up in code
merged Dev2 with showVideo
updated act indicator
updated
Merge branch 'Dev2' into merging
shows video
updated
Merge branch 'Dev2' of https://github.com/cgunarto/CAPSL into Dev2
resolve merge conflicts