Fixing build
Adding back comment
Merge pull request #205 from alxdarksage/develop

Fixing build for local on Travis
Changing type of data
Merge pull request #206 from alxdarksage/develop

Changing type of data
Merge pull request #203 from eric-wu/js

Upload controller and server-side encryption