Renaming /app/js to /app/scripts
Re-added compiled styles
Re-added
Merge branch 'develop'