Cleaned up file and removed from JSLint warnings
Merge branch 'develop'