Merge pull request #2 from pedrorgirardi/master

Safer search logic
Added timetable view controller placeholder and timetable cells.
Fixes for Xcode Beta 7