Merge /master into /dev (#543)

Merged `master` onto `dev`

Commits:

* add hindi translation (f9f69a7)
* added hindi translation (c5a3eb2)
* Update lang_hi.php (6bf8317)
* Merge pull request #454 from Akhil09/master (f19b5d5)
* Error Checking During Build Tests (#452) (de72b28)
* HHVM/Hack Typing Error Fixes (#450) (8e4151e)
* Require bxslider version 4.2.6 (Fixes #455) (#458) (c2957d7)
* Fixed Syntax Errors in Hindi Language (Fixes Build Errors) (#460) (899ab2b)
* Automated Game Start and Stop (#449) (ca40091)
* Attachments and Links Import/Export, Database Restore, and Control Cleanup (#451)(be35c6b)
* Update README.md (8d1db8c)
* Update README.md (8f16141)
* Update README.md (53a6fa7)
* Update README.md (300091c)
* Live Sync API (#459) (0b7ca09)
* I think its bad (#446) (d326564)
* Updated LiveSync Security (#494) (e880251)
* Temp fix for issue 499 & 500. Forcing Grunt to continue as it is not correctly detecting node_modules in the folder (#502) (dd3c874)
* Merge Deconflict of /dev and /master (#503) (51e06a7)
* Added Slack registration link to README (b11322e)
* Merge branch 'dev' into WraySec/fbctf/merge@7f8c281
* Fixed conflict in ScoreLog (e181da2)
* Fixed conflict in ScoreLog (dd9de6e)
* Fixed conflict in Control (f7c6439)
* Merge /dev/ to /master (#542) (3047351)

Author: justinwray

README.md

@@ -36,9 +36,11 @@ You’ve used it, now you want to make it better? Awesome! Pull requests are wel
 
 Facebook also has [bug bounty program](https://www.facebook.com/whitehat/) that includes FBCTF. If you find a security vulnerability in the platform, please submit it via the process outlined on that page and do not file a public issue.
 
+Feel free to join our slack by registering your email here: https://fbctf-slack.herokuapp.com/
+
 ## Have more questions?
 
-Check out the [wiki pages](https://github.com/facebook/fbctf/wiki) attached to this repo.
+Check out the [wiki pages](https://github.com/facebook/fbctf/wiki) attached to this repo. You can also ask on Slack by registering your email here: https://fbctf-slack.herokuapp.com/.
 
 ## License