adding demo credentials
Merge branch 'master' into demo
Merge branch 'master' into demo
temp commit
Merge branch 'master' into demo
Merge branch 'master' into demo
updating forum template
updating edools-school
Merge branch 'master' into demo
some apps features
correcting gruntfile
getting version automatically