branch
branch
Merge branch 'develop' of https://bitbucket.org/skyrunners/ppz_website into develop
in waitlist, change display of userId to userName
Merge branch 'master' into develop
Merge branch 'master' of https://bitbucket.org/skyrunners/ppz_website into develop
add phone
history
Merge branch 'master' into develop
added animation when manually schedules queue unit
added confirmation window on queue removal
added unit removal update & display front unit in all queue
changed public wait list view
added ticket printing
changed server to point to awsjp, added menu collapsing
file upload
Merge branch 'develop' into file_upload
update
login_hint&add_repeat
angular-file-upload plugin