commented out some empty if/else's that were causing WARNINGS by the closure compiler
Merge branch 'assemblyLine'
orderBy fix
Merge remote-tracking branch 'origin/master'