Merge branch 'develop-front-end' into integration-v1
Merge branch 'develop-front-end' into integration-v1
Infinite Scrolling Fn added

Done:
 - infinite scrolling available now in play list & music list
Logout Fn added

Done:
 - logout function

Bug Fix:
 - improved delay time when infinite scrolling occurs
Modified login fn

Done:
 - modified login ux from wide html to modal
Keypress Fn added

Done:
 - client ready to query to server
Merge branch 'develop-front-end' into integration-v1
Merge branch 'integration-v1' of github.com:VReality64/Pancake into serverside

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/login.js
	app/scripts/controllers/playlist.js
	app/views/login.html

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 On branch serverside
 Changes to be committed:

	modified:   .jshintrc
	deleted:    app/fb.html
	modified:   app/index.html
	modified:   app/lib/midi/pancakeplayer.js
	new file:   app/lib/ng-infinite-scroll.js
	modified:   app/scripts/app.js
	modified:   app/scripts/controllers/editor.js
	modified:   app/scripts/controllers/login.js
	modified:   app/scripts/controllers/main.js
	modified:   app/scripts/controllers/musiclist.js
	modified:   app/scripts/controllers/playlist.js
	modified:   app/scripts/services/services.js
	modified:   app/styles/main.css
	modified:   app/styles/main.scss
	modified:   app/views/login.html
	modified:   app/views/musiclist.html
	modified:   app/views/playlist.html
	modified:   bower.json
	deleted:    server/web/fb.js
	deleted:    server/web/query.js
login success