incremental
working
Merge branch 'master' into ver2
finished admin attendance update
added configurable text, sidebar and welcome page for reg
intermittant commit