Merge pull request #15 from amychiu/master

fixing problems
fixes
more fixes
Merge pull request #16 from amychiu/amy/development2

Amy/development2
movie updates
Merge pull request #17 from amychiu/amy/development2

movie updates
some updates
Merge pull request #18 from amychiu/amy/development2

some updates
search redesigned for genres
removed test controller
trailer
detail view updated
Merge pull request #19 from jmr12345/dev_withA

More updates
#s and sorting in library
connect trailer url and double spin
Merge pull request #20 from jmr12345/dev

updates
updated search
Merge pull request #21 from amychiu/amy/development2

updated search
added bar code scanner
Merge pull request #22 from amychiu/amy/development2

added bar code scanner