Moved directory 'library' to 'app'
Fixed bower dependencies
Merge remote-tracking branch 'origin/master'