diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..412eeda
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/auth.cfg.php.sample b/auth.cfg.php.sample
index 875e3d5..21b97e9 100644
--- a/auth.cfg.php.sample
+++ b/auth.cfg.php.sample
@@ -1,5 +1,5 @@
-<?php
-
-require_once('classes/auth_base.class.php');
-
-$AUTH = new Auth_Base();
+<?php
+
+require_once('classes/auth_base.class.php');
+
+$AUTH = new Auth_Base();
diff --git a/classes/auth_LDAP.class.php b/classes/auth_LDAP.class.php
index 84ef727..a5e549e 100755
--- a/classes/auth_LDAP.class.php
+++ b/classes/auth_LDAP.class.php
@@ -1,19 +1,19 @@
-<?php
-require_once dirname(__FILE__) . '/auth_base.class.php';
-
-class Auth_LDAP extends Auth_Base
-{
-    public function authenticate($user,$pass) {
-//echo "authenticating...\n";
-//echo 'user='.$user."\n";
-//echo 'pass='.$pass."\n";
-        if (parent::authenticate($user,$pass)) {
-            return true;
-        }
-
-
-        return false;
-    }
-}
-
+<?php
+require_once dirname(__FILE__) . '/auth_base.class.php';
+
+class Auth_LDAP extends Auth_Base
+{
+    public function authenticate($user,$pass) {
+//echo "authenticating...\n";
+//echo 'user='.$user."\n";
+//echo 'pass='.$pass."\n";
+        if (parent::authenticate($user,$pass)) {
+            return true;
+        }
+
+
+        return false;
+    }
+}
+
 ?>
\ No newline at end of file
diff --git a/doc/actions.txt b/doc/actions.txt
index 0505fe4..838b3af 100755
--- a/doc/actions.txt
+++ b/doc/actions.txt
@@ -1,571 +1,571 @@
-Equipment Reserve Actions
-
-A list of actions that the people using the system can take, and the role(s) necessary to take each action.
-
-GENERAL DESIGN/IMPLEMENTATION NOTE: 
-    all data manipulation actions should be implemented as ajax calls when possible, 
-    but navigation uses full page reloads
-
-------------------------------------
-ALL USERS
-------------------------------------
-
-View index page w/ log in form
-    reqs: 
-        currently in an unauthenticated session
-    effects:
-        WEB:
-            display tool title & other relevant public info
-            display log in form (https)
-        
-Log in
-    reqs:
-        has an LDAP account
-        currently in an unauthenticated session
-    effects:
-        WEB:
-            establish an authenticated session
-        DB:
-            if no eqreserve users table entry, create one and associated groups (if needed) and link_users_groups
-            else update users table, groups, and link_users_groups
-        LOG?:
-            track user log in event
-
-Log out
-    reqs:
-        currently in an authenticated session
-    effects:
-        WEB:
-            unauthenticate the session
-        LOG?:
-            track user log out event
-
-View index page w/ tool active
-    reqs: 
-        currently in an authenticated session
-    effects:
-        WEB:
-            show list of allowed system actions
-            show list of eq_groups, indicating level of access for each one
-        LOG?:
-            track user index view
-
-See available groups
-    reqs: 
-        currently in an authenticated session
-    effects:
-        WEB:
-            show list of eq_groups for which the current user has access
-                direct, via user id
-                indirect, via group membership
-            indicate role in each group, and from whence the role derives)
-        DB:
-            selects against
-                users
-                inst_groups
-                link_users_inst_groups
-                link_entities_roles_eq_groups
-        LOG?:
-            track user action
-
-See reservations list
-    reqs: 
-        currently in an authenticated session
-    notes: this is driven by the user_id and grouped by the block_group
-    effects:
-        WEB:
-            show list of reservations the user has made
-                flag manager_reservations
-            show a single entry per block_group, with a list of the items/entities that are tied together in that block group
-        DB:
-            selects
-        LOG?:
-            track user action
-
-------------------------------------
-ADMINS
-------------------------------------
-
-System action: create user
-    reqs: 
-        currently in an authenticated session
-        current user has admin role
-    notes: needs an LDAP search feature
-    effects:
-        WEB: display a user creation form
-        DB: create a users record, or update it if one already exists
-        LOG?:
-            track user action
-
-System action: look up user or institutional (LDAP) group
-    reqs: 
-        currently in an authenticated session
-        current user has admin role
-    effects:
-        WEB:
-            display a search form
-            display result set w/ record summaries for 2+ results
-                w/ links to single user or inst group view/edit
-                visual cue users vs inst groups
-            jump directly to single user or inst_group view/edit if 1 result
-            ??? if no local user, jump to LDAP search?
-        DB: select set of users based on criteria
-        LOG?:
-            track user action
-
-System action: view/edit base user info
-    reqs: 
-        currently in an authenticated session
-        current user has admin role
-    effects:
-        WEB:
-            display user info, with each field that can be edited in an editable form
-            display user roles
-                direct - via user id
-                indirect - via group membership
-        DB: retrieve and update a single users record
-        LOG?:
-            track user action
-
-System action: view/edit institutional (LDAP) group info
-    reqs: 
-        currently in an authenticated session
-        current user has admin role
-    effects:
-        WEB: display inst_group info, with each field that can be edited in an editable form
-        DB: retrieve and update a single inst_groups record
-        LOG?:
-            track user action
-
-System action: globally ban a user or institutional (LDAP) group
-    reqs: 
-        currently in an authenticated session
-        current user has admin role
-    effects:
-        WEB: a button/check on the edit user page
-        DB: flip the flag_is_banned field for the user
-        LOG?:
-            track user action
-
-System action: edit user/inst_group roles for eq_groups
-    reqs: 
-        currently in an authenticated session
-        current user has admin role
-    notes: 
-        editing access / roles from a group perspective is described / handled in the Group actions below
-        'banned' has the same effects as 'none', but can be reported on and is actively indicative of state
-    effects:
-        WEB:
-            select a user or entity from a list / search result, or from the view / edit form for that user / inst_group
-            for a given user or group entity, list all eq groups, with current role for each group (banned, none, customer, manager)
-            allow changing of roles
-        DB: 
-            adds, or deletes (or updates - maybe? might just do ti all w/ adds/deletes) link_entity_roles_eq_groups records
-        LOG?:
-            track user action
-
-System action: create equipment group
-    reqs: 
-        currently in an authenticated session
-        current user has admin role
-    effects:
-        WEB: displays form for creating an equipment group
-        DB: eq_groups record created
-        LOG?:
-            track user action
-
-NOTE: editing an equipment group is described / handled in the Group actions below
-
-Group action: delete equipment group
-    reqs: 
-        currently in an authenticated session
-        current user has admin role
-    effects:
-        WEB:
-            list all equipment groups
-            confirm action check
-            'delete' selected one
-        DB:
-            mark appropriate eq_group record(s) as deleted
-        LOG?:
-            track user action
-
-------------------------------------
-MANAGERS (and ADMINS? might just require an admin to grant themselves manager role for the relevant group)
-------------------------------------
-
-Group action: view/edit group info
-    reqs: 
-        currently in an authenticated session
-        current user has manager role for this group
-    notes: there are many actions associated with groups and which would appear on main group view page, these are detailed below
-    effects:
-        WEB:
-            display eq group info, with each field that can be edited in an editable form
-        DB:
-            retrieve and update a single eq_groups record
-        LOG?:
-            track user action
-
-Group action: (sub-action of view/edit group) manage entity roles for this group
-    reqs: 
-        currently in an authenticated session
-        current user has manager role for this group
-    effects:
-        WEB:
-            show list of entities that have roles in the group (sortable by entity type, name, and role) - see DKC's work w/ sortable tables
-                quick-form (ajax-y) for adding a new entity role
-                    include on-the-fly entity creation?
-        DB:
-            adds, or deletes (or updates - maybe? might just do ti all w/ adds/deletes) link_entity_roles_eq_groups records
-        LOG?:
-            track user action
-
-Group action: (sub-action of view/edit group) make scheduling rules for this group
-    reqs: 
-        currently in an authenticated session
-        current user has manager role for this group
-    effects:
-        WEB:
-            show scheduling rule, and allow editing there-of
-        DB:
-            retrieve and update a single scheduling_rules record
-        LOG?:
-            track user action
-
-Group action: (sub-action of view/edit group) create availability block for this group
-    reqs: 
-        currently in an authenticated session
-        current user has manager role for this group
-        this group has a scheduling rule
-    effects:
-        WEB:
-            show overview of scheduling/reservations for the group
-                calendar format (days horizontally and items (sub-grouped) vertically?)
-                list format
-        DB:
-            create availability block(s)
-        LOG?:
-            track user action
-
-Group action: (sub-action of view/edit group) create an manager reserve block for this group
-    reqs: 
-        currently in an authenticated session
-        current user has manager role for this group
-        this group has a scheduling rule
-    effects:
-        WEB:
-            show overview of scheduling/reservations for the group
-                calendar format (days horizontally and items (sub-grouped) vertically?)
-                list format
-        DB:
-            create manager reserve block(s) for the group
-        LOG?:
-            track user action
-
-Group action: (sub-action of view/edit group) view and re-order sub-groups and items for this group
-    reqs: 
-        currently in an authenticated session
-        current user has manager role for this group
-    notes: this can also be done individually by editing specific sub-groups, but this is conceptually a separate action
-    effects:
-        WEB:
-            list eq sub-groups and eq items, appropriately organized
-        DB:
-            alter the ordering values for the relevant record(s)
-        LOG?:
-            track user action
-
-Group action: (sub-action of view/edit group) create sub-group for this group
-    reqs: 
-        currently in an authenticated session
-        current user has manager role for this group
-    effects:
-        WEB:
-            show add button at top and/or bottom of sub-group list
-            show sub-group creation form in-place (i.e. no page reload)
-            hide form on creation
-            dynamically add new sub-group info on creation / form hiding
-        DB:
-            create eq_subgroups record
-        LOG?:
-            track user action
-
-Group action: REPORTS on eq_group 
-    reqs: 
-        currently in an authenticated session
-        current user has manager role for this group
-    effects:
-        WEB:
-            over all activity, per item
-                # users
-                % in use
-                ????
-                specific users and times
-            filter by time
-                all
-                historical
-                upcoming/future
-        DB: various SELECTs
-        LOG?:
-            track user action
-
--------------------
-
-THIS IS HANDLED AT THE GROUP LEVEL
-XGroup action: edit sub-group info
-X    reqs: 
-X        currently in an authenticated session
-X        current user has manager role for this group
-X    effects:
-X        WEB:
-X            in-place editing form
-X        DB:
-X            update eq_subgroups record
-X        LOG?:
-X            track user action
-
-THIS IS HANDLED AT THE GROUP LEVEL
-XGroup action: delete sub-group
-X    reqs: 
-X        currently in an authenticated session
-X        current user has manager role for this group
-X    effects:
-X        WEB:
-X            delete button
-X            confirm action check
-X        DB:
-X            mark eq_subgroups record as deleted
-X        LOG?:
-X            track user action
-
-[Group action: make scheduling rules for this sub-group
-[    reqs: 
-[        currently in an authenticated session
-[        current user has manager role for this group
-[    notes:
-[        fail back to group level rule
-[    effects:
-[        WEB:
-[        DB:
-[        LOG?:
-[            track user action
-
-[Group action: create availability block for this sub-group
-[    reqs: 
-[        currently in an authenticated session
-[        current user has manager role for this group
-[    notes:
-[        fail back to group level availability
-[    effects:
-[        WEB:
-[        DB:
-[        LOG?:
-[            track user action
-
-[Group action: create an manager reserve block for this sub-group
-[    reqs: 
-[        currently in an authenticated session
-[        current user has manager role for this group
-[        this group has a scheduling rule
-[    effects:
-[        WEB:
-[            show overview of scheduling/reservations for the group
-[                calendar format (days horizontally and items (sub-grouped) vertically?)
-[                list format
-[        DB:
-[            create manager reserve block(s) for the sub-group
-[        LOG?:
-[            track user action
-
-THIS IS HANDLED AT THE GROUP LEVEL
-XGroup action: re-order items within this sub-group
-X    reqs: 
-X        currently in an authenticated session
-X        current user has manager role for this group
-X    notes: this can also be done individually by editing specific items, but this is conceptually a separate action
-X    effects:
-X        WEB:
-X        DB:
-X        LOG?:
-X            track user action
-
-THIS IS HANDLED AT THE GROUP LEVEL
-XGroup action: create item
-X    reqs: 
-X        currently in an authenticated session
-X        current user has manager role for this group
-X    effects:
-X        WEB:
-X        DB:
-X        LOG?:
-X            track user action
-
-THIS IS HANDLED AT THE GROUP LEVEL
-XGroup action: edit item
-X    reqs: 
-X        currently in an authenticated session
-X        current user has manager role for this group
-X    effects:
-X        WEB:
-X        DB:
-X        LOG?:
-X            track user action
-
-THIS IS HANDLED AT THE GROUP LEVEL
-XGroup action: delete item
-X    reqs: 
-X        currently in an authenticated session
-X        current user has manager role for this group
-X    effects:
-X        WEB:
-X        DB:
-X        LOG?:
-X            track user action
-
-[Group action: make scheduling rules for this item
-[    reqs: 
-[        currently in an authenticated session
-[        current user has manager role for this group
-[    notes:
-[        fail back to group level availability
-[    effects:
-[        WEB:
-[        DB:
-[        LOG?:
-[            track user action
-
-[Group action: create availability block for this item
-[    reqs: 
-[        currently in an authenticated session
-[        current user has manager role for this group
-[    effects:
-[        WEB:
-[        DB:
-[        LOG?:
-[            track user action
-
-Group action: create an manager reserve block for this item
-    reqs: 
-        currently in an authenticated session
-        current user has manager role for this group
-        this group has a scheduling rule
-    notes: the UI for this is the same as consumer reservation, but there's a checkbox to make it a manager reservation; ALSO, the back-end implementation is the same, except- conflicts do not cause an abort, over-rides of non-manager reservations send an alert to the person that made the other reservation, and the other reservation is removed/deleted
-    effects:
-        WEB:
-            show overview of scheduling/reservations for the group
-                calendar format (days horizontally and items (sub-grouped) vertically?)
-                list format
-        DB:
-            create manager reserve block(s) for the sub-group
-        LOG?:
-            track user action
-
-------------------------------------
-CONSUMERS (and MANAGERS and ADMINS? might require them to grant themselves the consumer role for the group...)
-------------------------------------
-
-Consumer action: see group info
-    reqs: 
-        currently in an authenticated session
-        current user has consumer role for the group (direct or indirect)
-        this group has a scheduling rule
-    effects:
-        WEB:
-            show eq_group info
-            show eq_subgroups - mouse over for descr
-            show eq_items - mouse over for descr and image (if the latter exists)
-            show overview of scheduling/reservations for the group
-                calendar format (days horizontally and items (sub-grouped) vertically?)
-                list format
-        DB:
-            many selects
-        LOG?:
-            track user action
-
-Consumer action: specify a reservation
-    reqs: 
-        currently in an authenticated session
-        current user has consumer role for the group (direct or indirect)
-        this group has a scheduling rule
-    notes: there's a complex interplay between choosing items and choosing times- as items are chosen, various times become unavailable, and as times are chosen various items become unavailable. Try to make UI handle this in a flexible manner...
-    effects:
-        WEB:
-            show overview of scheduling/reservations for the group
-                calendar format (days horizontally and items (sub-grouped) vertically?)
-                list format
-            user chooses eq_items - limited by availability
-            user specifies time block (start, end) - limited by scheduling rules and availability
-        DB:
-            many selects
-        LOG?:
-            track user action
-
-Consumer action: (related to the above) create/make a reservations
-    reqs: 
-        currently in an authenticated session
-        current user has consumer role for the group (direct or indirect)
-        reservation spec-ed by above process
-        this group has a scheduling rule
-    notes: 
-    effects:
-        WEB:
-            post-creation, jump to the reservation view page
-        DB:
-            create the relevant time blocks, linked with a unique block_group identifier
-        LOG?:
-            track user action
-
-Consumer action: see reservation details
-    reqs: 
-        currently in an authenticated session
-        user is the creator/owner of the reservation
-    effects:
-        WEB:
-            show eq_group, eq_subgroups, eq_items, and time_blocks
-        DB:
-            selects
-        LOG?:
-            track user action
-
-
-THIS IS HANDLED ON THE VIEW RESERVATION PAGE
-XConsumer action: delete a reservations
-X    reqs: 
-X        currently in an authenticated session
-X        current user has consumer role for the group (direct or indirect)
-X        reservation spec-ed by above process
-X    notes: handled by a button on the view page
-X    effects:
-X        WEB:
-X            confirm action check
-X            post delete head to either the reservations list or the group info page, depending on where the user last visited
-X        DB:
-X            mark the relvant time blocks as deleted
-X        LOG?:
-X            track user action
-
-
-[NOT SURE HOW / IF TO HANDLE THIS... certainly easier to have user just delete and re-create
-[    - also relatively simple to allow reductive edits (remove items, shrink times)
-[    - adding items is tricky
-[    - altering times (extending and/or shifting) is tricky
-[Consumer action: edit reservation
-[    reqs: 
-[        currently in an authenticated session
-[        user is the creator/owner of the reservation
-[    effects:
-[        WEB:
-[            show reservation details
-[            show other eq_group info
-[               sub-groups and items
-[               calendar / time list
-[            allow alteration of time blocks
-[            allow addition of items
-[            allow removal of items
-[        DB:
-[            create, alter, or delete time blocks
-[        LOG?:
-[            track user action
-
-
+Equipment Reserve Actions
+
+A list of actions that the people using the system can take, and the role(s) necessary to take each action.
+
+GENERAL DESIGN/IMPLEMENTATION NOTE: 
+    all data manipulation actions should be implemented as ajax calls when possible, 
+    but navigation uses full page reloads
+
+------------------------------------
+ALL USERS
+------------------------------------
+
+View index page w/ log in form
+    reqs: 
+        currently in an unauthenticated session
+    effects:
+        WEB:
+            display tool title & other relevant public info
+            display log in form (https)
+        
+Log in
+    reqs:
+        has an LDAP account
+        currently in an unauthenticated session
+    effects:
+        WEB:
+            establish an authenticated session
+        DB:
+            if no eqreserve users table entry, create one and associated groups (if needed) and link_users_groups
+            else update users table, groups, and link_users_groups
+        LOG?:
+            track user log in event
+
+Log out
+    reqs:
+        currently in an authenticated session
+    effects:
+        WEB:
+            unauthenticate the session
+        LOG?:
+            track user log out event
+
+View index page w/ tool active
+    reqs: 
+        currently in an authenticated session
+    effects:
+        WEB:
+            show list of allowed system actions
+            show list of eq_groups, indicating level of access for each one
+        LOG?:
+            track user index view
+
+See available groups
+    reqs: 
+        currently in an authenticated session
+    effects:
+        WEB:
+            show list of eq_groups for which the current user has access
+                direct, via user id
+                indirect, via group membership
+            indicate role in each group, and from whence the role derives)
+        DB:
+            selects against
+                users
+                inst_groups
+                link_users_inst_groups
+                link_entities_roles_eq_groups
+        LOG?:
+            track user action
+
+See reservations list
+    reqs: 
+        currently in an authenticated session
+    notes: this is driven by the user_id and grouped by the block_group
+    effects:
+        WEB:
+            show list of reservations the user has made
+                flag manager_reservations
+            show a single entry per block_group, with a list of the items/entities that are tied together in that block group
+        DB:
+            selects
+        LOG?:
+            track user action
+
+------------------------------------
+ADMINS
+------------------------------------
+
+System action: create user
+    reqs: 
+        currently in an authenticated session
+        current user has admin role
+    notes: needs an LDAP search feature
+    effects:
+        WEB: display a user creation form
+        DB: create a users record, or update it if one already exists
+        LOG?:
+            track user action
+
+System action: look up user or institutional (LDAP) group
+    reqs: 
+        currently in an authenticated session
+        current user has admin role
+    effects:
+        WEB:
+            display a search form
+            display result set w/ record summaries for 2+ results
+                w/ links to single user or inst group view/edit
+                visual cue users vs inst groups
+            jump directly to single user or inst_group view/edit if 1 result
+            ??? if no local user, jump to LDAP search?
+        DB: select set of users based on criteria
+        LOG?:
+            track user action
+
+System action: view/edit base user info
+    reqs: 
+        currently in an authenticated session
+        current user has admin role
+    effects:
+        WEB:
+            display user info, with each field that can be edited in an editable form
+            display user roles
+                direct - via user id
+                indirect - via group membership
+        DB: retrieve and update a single users record
+        LOG?:
+            track user action
+
+System action: view/edit institutional (LDAP) group info
+    reqs: 
+        currently in an authenticated session
+        current user has admin role
+    effects:
+        WEB: display inst_group info, with each field that can be edited in an editable form
+        DB: retrieve and update a single inst_groups record
+        LOG?:
+            track user action
+
+System action: globally ban a user or institutional (LDAP) group
+    reqs: 
+        currently in an authenticated session
+        current user has admin role
+    effects:
+        WEB: a button/check on the edit user page
+        DB: flip the flag_is_banned field for the user
+        LOG?:
+            track user action
+
+System action: edit user/inst_group roles for eq_groups
+    reqs: 
+        currently in an authenticated session
+        current user has admin role
+    notes: 
+        editing access / roles from a group perspective is described / handled in the Group actions below
+        'banned' has the same effects as 'none', but can be reported on and is actively indicative of state
+    effects:
+        WEB:
+            select a user or entity from a list / search result, or from the view / edit form for that user / inst_group
+            for a given user or group entity, list all eq groups, with current role for each group (banned, none, customer, manager)
+            allow changing of roles
+        DB: 
+            adds, or deletes (or updates - maybe? might just do ti all w/ adds/deletes) link_entity_roles_eq_groups records
+        LOG?:
+            track user action
+
+System action: create equipment group
+    reqs: 
+        currently in an authenticated session
+        current user has admin role
+    effects:
+        WEB: displays form for creating an equipment group
+        DB: eq_groups record created
+        LOG?:
+            track user action
+
+NOTE: editing an equipment group is described / handled in the Group actions below
+
+Group action: delete equipment group
+    reqs: 
+        currently in an authenticated session
+        current user has admin role
+    effects:
+        WEB:
+            list all equipment groups
+            confirm action check
+            'delete' selected one
+        DB:
+            mark appropriate eq_group record(s) as deleted
+        LOG?:
+            track user action
+
+------------------------------------
+MANAGERS (and ADMINS? might just require an admin to grant themselves manager role for the relevant group)
+------------------------------------
+
+Group action: view/edit group info
+    reqs: 
+        currently in an authenticated session
+        current user has manager role for this group
+    notes: there are many actions associated with groups and which would appear on main group view page, these are detailed below
+    effects:
+        WEB:
+            display eq group info, with each field that can be edited in an editable form
+        DB:
+            retrieve and update a single eq_groups record
+        LOG?:
+            track user action
+
+Group action: (sub-action of view/edit group) manage entity roles for this group
+    reqs: 
+        currently in an authenticated session
+        current user has manager role for this group
+    effects:
+        WEB:
+            show list of entities that have roles in the group (sortable by entity type, name, and role) - see DKC's work w/ sortable tables
+                quick-form (ajax-y) for adding a new entity role
+                    include on-the-fly entity creation?
+        DB:
+            adds, or deletes (or updates - maybe? might just do ti all w/ adds/deletes) link_entity_roles_eq_groups records
+        LOG?:
+            track user action
+
+Group action: (sub-action of view/edit group) make scheduling rules for this group
+    reqs: 
+        currently in an authenticated session
+        current user has manager role for this group
+    effects:
+        WEB:
+            show scheduling rule, and allow editing there-of
+        DB:
+            retrieve and update a single scheduling_rules record
+        LOG?:
+            track user action
+
+Group action: (sub-action of view/edit group) create availability block for this group
+    reqs: 
+        currently in an authenticated session
+        current user has manager role for this group
+        this group has a scheduling rule
+    effects:
+        WEB:
+            show overview of scheduling/reservations for the group
+                calendar format (days horizontally and items (sub-grouped) vertically?)
+                list format
+        DB:
+            create availability block(s)
+        LOG?:
+            track user action
+
+Group action: (sub-action of view/edit group) create an manager reserve block for this group
+    reqs: 
+        currently in an authenticated session
+        current user has manager role for this group
+        this group has a scheduling rule
+    effects:
+        WEB:
+            show overview of scheduling/reservations for the group
+                calendar format (days horizontally and items (sub-grouped) vertically?)
+                list format
+        DB:
+            create manager reserve block(s) for the group
+        LOG?:
+            track user action
+
+Group action: (sub-action of view/edit group) view and re-order sub-groups and items for this group
+    reqs: 
+        currently in an authenticated session
+        current user has manager role for this group
+    notes: this can also be done individually by editing specific sub-groups, but this is conceptually a separate action
+    effects:
+        WEB:
+            list eq sub-groups and eq items, appropriately organized
+        DB:
+            alter the ordering values for the relevant record(s)
+        LOG?:
+            track user action
+
+Group action: (sub-action of view/edit group) create sub-group for this group
+    reqs: 
+        currently in an authenticated session
+        current user has manager role for this group
+    effects:
+        WEB:
+            show add button at top and/or bottom of sub-group list
+            show sub-group creation form in-place (i.e. no page reload)
+            hide form on creation
+            dynamically add new sub-group info on creation / form hiding
+        DB:
+            create eq_subgroups record
+        LOG?:
+            track user action
+
+Group action: REPORTS on eq_group 
+    reqs: 
+        currently in an authenticated session
+        current user has manager role for this group
+    effects:
+        WEB:
+            over all activity, per item
+                # users
+                % in use
+                ????
+                specific users and times
+            filter by time
+                all
+                historical
+                upcoming/future
+        DB: various SELECTs
+        LOG?:
+            track user action
+
+-------------------
+
+THIS IS HANDLED AT THE GROUP LEVEL
+XGroup action: edit sub-group info
+X    reqs: 
+X        currently in an authenticated session
+X        current user has manager role for this group
+X    effects:
+X        WEB:
+X            in-place editing form
+X        DB:
+X            update eq_subgroups record
+X        LOG?:
+X            track user action
+
+THIS IS HANDLED AT THE GROUP LEVEL
+XGroup action: delete sub-group
+X    reqs: 
+X        currently in an authenticated session
+X        current user has manager role for this group
+X    effects:
+X        WEB:
+X            delete button
+X            confirm action check
+X        DB:
+X            mark eq_subgroups record as deleted
+X        LOG?:
+X            track user action
+
+[Group action: make scheduling rules for this sub-group
+[    reqs: 
+[        currently in an authenticated session
+[        current user has manager role for this group
+[    notes:
+[        fail back to group level rule
+[    effects:
+[        WEB:
+[        DB:
+[        LOG?:
+[            track user action
+
+[Group action: create availability block for this sub-group
+[    reqs: 
+[        currently in an authenticated session
+[        current user has manager role for this group
+[    notes:
+[        fail back to group level availability
+[    effects:
+[        WEB:
+[        DB:
+[        LOG?:
+[            track user action
+
+[Group action: create an manager reserve block for this sub-group
+[    reqs: 
+[        currently in an authenticated session
+[        current user has manager role for this group
+[        this group has a scheduling rule
+[    effects:
+[        WEB:
+[            show overview of scheduling/reservations for the group
+[                calendar format (days horizontally and items (sub-grouped) vertically?)
+[                list format
+[        DB:
+[            create manager reserve block(s) for the sub-group
+[        LOG?:
+[            track user action
+
+THIS IS HANDLED AT THE GROUP LEVEL
+XGroup action: re-order items within this sub-group
+X    reqs: 
+X        currently in an authenticated session
+X        current user has manager role for this group
+X    notes: this can also be done individually by editing specific items, but this is conceptually a separate action
+X    effects:
+X        WEB:
+X        DB:
+X        LOG?:
+X            track user action
+
+THIS IS HANDLED AT THE GROUP LEVEL
+XGroup action: create item
+X    reqs: 
+X        currently in an authenticated session
+X        current user has manager role for this group
+X    effects:
+X        WEB:
+X        DB:
+X        LOG?:
+X            track user action
+
+THIS IS HANDLED AT THE GROUP LEVEL
+XGroup action: edit item
+X    reqs: 
+X        currently in an authenticated session
+X        current user has manager role for this group
+X    effects:
+X        WEB:
+X        DB:
+X        LOG?:
+X            track user action
+
+THIS IS HANDLED AT THE GROUP LEVEL
+XGroup action: delete item
+X    reqs: 
+X        currently in an authenticated session
+X        current user has manager role for this group
+X    effects:
+X        WEB:
+X        DB:
+X        LOG?:
+X            track user action
+
+[Group action: make scheduling rules for this item
+[    reqs: 
+[        currently in an authenticated session
+[        current user has manager role for this group
+[    notes:
+[        fail back to group level availability
+[    effects:
+[        WEB:
+[        DB:
+[        LOG?:
+[            track user action
+
+[Group action: create availability block for this item
+[    reqs: 
+[        currently in an authenticated session
+[        current user has manager role for this group
+[    effects:
+[        WEB:
+[        DB:
+[        LOG?:
+[            track user action
+
+Group action: create an manager reserve block for this item
+    reqs: 
+        currently in an authenticated session
+        current user has manager role for this group
+        this group has a scheduling rule
+    notes: the UI for this is the same as consumer reservation, but there's a checkbox to make it a manager reservation; ALSO, the back-end implementation is the same, except- conflicts do not cause an abort, over-rides of non-manager reservations send an alert to the person that made the other reservation, and the other reservation is removed/deleted
+    effects:
+        WEB:
+            show overview of scheduling/reservations for the group
+                calendar format (days horizontally and items (sub-grouped) vertically?)
+                list format
+        DB:
+            create manager reserve block(s) for the sub-group
+        LOG?:
+            track user action
+
+------------------------------------
+CONSUMERS (and MANAGERS and ADMINS? might require them to grant themselves the consumer role for the group...)
+------------------------------------
+
+Consumer action: see group info
+    reqs: 
+        currently in an authenticated session
+        current user has consumer role for the group (direct or indirect)
+        this group has a scheduling rule
+    effects:
+        WEB:
+            show eq_group info
+            show eq_subgroups - mouse over for descr
+            show eq_items - mouse over for descr and image (if the latter exists)
+            show overview of scheduling/reservations for the group
+                calendar format (days horizontally and items (sub-grouped) vertically?)
+                list format
+        DB:
+            many selects
+        LOG?:
+            track user action
+
+Consumer action: specify a reservation
+    reqs: 
+        currently in an authenticated session
+        current user has consumer role for the group (direct or indirect)
+        this group has a scheduling rule
+    notes: there's a complex interplay between choosing items and choosing times- as items are chosen, various times become unavailable, and as times are chosen various items become unavailable. Try to make UI handle this in a flexible manner...
+    effects:
+        WEB:
+            show overview of scheduling/reservations for the group
+                calendar format (days horizontally and items (sub-grouped) vertically?)
+                list format
+            user chooses eq_items - limited by availability
+            user specifies time block (start, end) - limited by scheduling rules and availability
+        DB:
+            many selects
+        LOG?:
+            track user action
+
+Consumer action: (related to the above) create/make a reservations
+    reqs: 
+        currently in an authenticated session
+        current user has consumer role for the group (direct or indirect)
+        reservation spec-ed by above process
+        this group has a scheduling rule
+    notes: 
+    effects:
+        WEB:
+            post-creation, jump to the reservation view page
+        DB:
+            create the relevant time blocks, linked with a unique block_group identifier
+        LOG?:
+            track user action
+
+Consumer action: see reservation details
+    reqs: 
+        currently in an authenticated session
+        user is the creator/owner of the reservation
+    effects:
+        WEB:
+            show eq_group, eq_subgroups, eq_items, and time_blocks
+        DB:
+            selects
+        LOG?:
+            track user action
+
+
+THIS IS HANDLED ON THE VIEW RESERVATION PAGE
+XConsumer action: delete a reservations
+X    reqs: 
+X        currently in an authenticated session
+X        current user has consumer role for the group (direct or indirect)
+X        reservation spec-ed by above process
+X    notes: handled by a button on the view page
+X    effects:
+X        WEB:
+X            confirm action check
+X            post delete head to either the reservations list or the group info page, depending on where the user last visited
+X        DB:
+X            mark the relvant time blocks as deleted
+X        LOG?:
+X            track user action
+
+
+[NOT SURE HOW / IF TO HANDLE THIS... certainly easier to have user just delete and re-create
+[    - also relatively simple to allow reductive edits (remove items, shrink times)
+[    - adding items is tricky
+[    - altering times (extending and/or shifting) is tricky
+[Consumer action: edit reservation
+[    reqs: 
+[        currently in an authenticated session
+[        user is the creator/owner of the reservation
+[    effects:
+[        WEB:
+[            show reservation details
+[            show other eq_group info
+[               sub-groups and items
+[               calendar / time list
+[            allow alteration of time blocks
+[            allow addition of items
+[            allow removal of items
+[        DB:
+[            create, alter, or delete time blocks
+[        LOG?:
+[            track user action
+
+
diff --git a/doc/architecture.txt b/doc/architecture.txt
index d7524fc..4c6efcf 100644
--- a/doc/architecture.txt
+++ b/doc/architecture.txt
@@ -1,55 +1,55 @@
-Equipment Reserve
-
-This is a system / application to enable efficient use of limited resources via scheduling.
-
-The file structure is
-- app root : license, readme, config files, primary php files
-        ## index.php
-        ## institution.cfg.php - this file has all the institution specific and/or sensitive info (e.g. db connection strings)
-        ## auth.cfg.php - local config info specifically related to the authentication system that the app uses
-  + classes : various PHP class files
-  + css : all the style sheets
-        ## style.css - general styling of HTML elements and web page layout
-        ## calendar.css - making a calendar look good
-        ## ui.css - styling specific to interactivity
-  + db_setup : files / documents relating to setting up the database, but unused once the app is up and running
-        ## schema.sql - the sql code necessary to create the table structure for this app
-  + doc : documentation for/about the system
-        ## architecture.txt - an overview of how the app is organized 
-  + js : local javascript; there's a jquery dir here, but only as a palce to organize plugins as the main jquerylibrary will be loaded form a cdn source
-        ## app.js - general javascript for the application
-    * jquery
-        % plugins : has sub-folders for each plugin
-  + tests : automated tests (unit, functional, integration)
-    * simpletest : the SimpleTest php unit testing framework
-
-
-
-The general approach is individual PHP pages for primary navigation / functional grouping:
-    index/login/landing
-    group
-    own account
-    item details
-    reservation details
-    
-Within each functional grouping individual functions are implemented as ajax calls and/or other in-place behavior (i.e. whenever DB info/interaction is not needed then there's no reason for a call to the server).
-
-The classes fall into 2 general categories: data objects, and application infrastructure.
-
-The data object classes are all based on a root db_linked class which handles all basic MySQL DB IO and also has some static methods that handle some basic library-like DB methods (e.g. automatically correctly quote a constant, build pre-set sections of queries, etc.).
-
-The app infrastructure classes are:
-    Session - a basic session handling wrapper, with sugar methods to make other code easier to read (e.g. session.isAuthenticated)
-    AuthRoot - defines an interface that any auth module must support
-        AuthLDAP - a simple implementation of AuthRoot that uses LDAP as the authority
-    
-
-The PHP pages use a general approach of
-<?php
-include header - handles session stuff, as well as basic HTML header+ output
-
-do stuff
-
-include footer - handles any clean up necessary, as well as basic end-of-page HTML
-?>
-
+Equipment Reserve
+
+This is a system / application to enable efficient use of limited resources via scheduling.
+
+The file structure is
+- app root : license, readme, config files, primary php files
+        ## index.php
+        ## institution.cfg.php - this file has all the institution specific and/or sensitive info (e.g. db connection strings)
+        ## auth.cfg.php - local config info specifically related to the authentication system that the app uses
+  + classes : various PHP class files
+  + css : all the style sheets
+        ## style.css - general styling of HTML elements and web page layout
+        ## calendar.css - making a calendar look good
+        ## ui.css - styling specific to interactivity
+  + db_setup : files / documents relating to setting up the database, but unused once the app is up and running
+        ## schema.sql - the sql code necessary to create the table structure for this app
+  + doc : documentation for/about the system
+        ## architecture.txt - an overview of how the app is organized 
+  + js : local javascript; there's a jquery dir here, but only as a palce to organize plugins as the main jquerylibrary will be loaded form a cdn source
+        ## app.js - general javascript for the application
+    * jquery
+        % plugins : has sub-folders for each plugin
+  + tests : automated tests (unit, functional, integration)
+    * simpletest : the SimpleTest php unit testing framework
+
+
+
+The general approach is individual PHP pages for primary navigation / functional grouping:
+    index/login/landing
+    group
+    own account
+    item details
+    reservation details
+    
+Within each functional grouping individual functions are implemented as ajax calls and/or other in-place behavior (i.e. whenever DB info/interaction is not needed then there's no reason for a call to the server).
+
+The classes fall into 2 general categories: data objects, and application infrastructure.
+
+The data object classes are all based on a root db_linked class which handles all basic MySQL DB IO and also has some static methods that handle some basic library-like DB methods (e.g. automatically correctly quote a constant, build pre-set sections of queries, etc.).
+
+The app infrastructure classes are:
+    Session - a basic session handling wrapper, with sugar methods to make other code easier to read (e.g. session.isAuthenticated)
+    AuthRoot - defines an interface that any auth module must support
+        AuthLDAP - a simple implementation of AuthRoot that uses LDAP as the authority
+    
+
+The PHP pages use a general approach of
+<?php
+include header - handles session stuff, as well as basic HTML header+ output
+
+do stuff
+
+include footer - handles any clean up necessary, as well as basic end-of-page HTML
+?>
+
diff --git a/doc/mockups/_BASE.html b/doc/mockups/_BASE.html
index a09f38a..3a414d3 100644
--- a/doc/mockups/_BASE.html
+++ b/doc/mockups/_BASE.html
@@ -1,23 +1,23 @@
-<html xmlns="https://www.w3.org/1999/xhtml">
- <head>
-  <title>MOCK UP EqReserve: </title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
- </head>
- <body>
-
-<div class="legend general_user">general user</div>
-<div class="legend admin_user">system admin</div>
-<div class="legend manager_user">equipment mananger</div>
-<div class="legend consumer_user">consumer</div>
-<br clear="all"/>
-<h1 class="commentary">page, state</h1>
-
-<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: </h2>
-
-<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
-<br clear="all"/>
-
- </body>
+<html xmlns="https://www.w3.org/1999/xhtml">
+ <head>
+  <title>MOCK UP EqReserve: </title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
+ </head>
+ <body>
+
+<div class="legend general_user">general user</div>
+<div class="legend admin_user">system admin</div>
+<div class="legend manager_user">equipment mananger</div>
+<div class="legend consumer_user">consumer</div>
+<br clear="all"/>
+<h1 class="commentary">page, state</h1>
+
+<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: </h2>
+
+<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
+<br clear="all"/>
+
+ </body>
 <html>
\ No newline at end of file
diff --git a/doc/mockups/account_mgt.html b/doc/mockups/account_mgt.html
index 38aa017..5b5ba5d 100755
--- a/doc/mockups/account_mgt.html
+++ b/doc/mockups/account_mgt.html
@@ -1,81 +1,81 @@
-<html xmlns="https://www.w3.org/1999/xhtml">
- <head>
-  <title>MOCK UP EqReserve: account management</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
- </head>
- <body>
-
-<div class="legend general_user">general user</div>
-<div class="legend admin_user">system admin</div>
-<div class="legend manager_user">equipment mananger</div>
-<div class="legend consumer_user">consumer</div>
-<br clear="all"/>
-<h1 class="commentary">account managment, logged in</h1>
-
-<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: account management</h2>
-<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
-<br clear="all"/>
-
-<h3 class="commentary">all managers and system admins can also see the content on this page; admins can edit it (and in fact can edit any field, not just the ones show below for the general user to manage their own account)</h3>
-<br clear="all"/>
-
-Username: vcb1<br/>
-First name: Violet<br/>
-Last name: Bovinea<br/>
-Screen name:<input type="text" value="Violet"/><br/>
-Email: Violet.C.Bovinea@williams.edu<br/>
-Phone: <input type="text" value=""/><br/>
-
-Williams groups:<br/>
-	Student<br/>
-	13S-BIOL-750<br/>
-	13S-ECON-101<br/>
-	13S-CSCI-371<br/>
-	13S-ARTS-300<br/>
-
-<br/>
-<br/>
-
-Notes/comments:<br/><textarea style="width: 100%;">I'll be working on a very important project in Spring 2013</textarea>
-<br/>
-<br/>
-
-<div>
-
-<h3>Alert Preferences</h3>
-
-<table>
- <tr><td>equipment</td><td class="consumer_user">upcoming reservation reminder</td><td class="manager_user">on reservations made</td><td class="manager_user">on cancellations</td></tr>
- <tr><td><a href="eq_group.html">other things</a></td><td class="consumer_user"><input type="checkbox"/></td><td class="manager_user"><input type="checkbox"/></td><td class="manager_user"><input type="checkbox"/></td></tr>
-</table>
-
-</div>
-
-<br/>
-<br/>
-
-<div class="consumer_user">
-
-<h3>Upcoming Reserves</h3>
-
-<table>
- <tr><td>time</td><td>equipment</td></tr>
- <tr><td><a href="view_reservation.html">2013/02/17 9:00PM-11:00PM</a></td><td><a href="eq_group.html">lasers : diffuser, refractor, reflector</a></td></tr>
-</table>
-
-<br/>
-<br/>
-
-<h3>Historical Reserves</h3>
-
-<table>
- <tr><td>time</td><td>equipment</td></tr>
- <tr><td><a href="view_reservation.html">2012/11/22 3:00PM-8:00PM</a></td><td><a href="eq_group.html">lasers : nose cone B, tray A, computer A</a></td></tr>
-</table>
-
-</div>
-
- </body>
+<html xmlns="https://www.w3.org/1999/xhtml">
+ <head>
+  <title>MOCK UP EqReserve: account management</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
+ </head>
+ <body>
+
+<div class="legend general_user">general user</div>
+<div class="legend admin_user">system admin</div>
+<div class="legend manager_user">equipment mananger</div>
+<div class="legend consumer_user">consumer</div>
+<br clear="all"/>
+<h1 class="commentary">account managment, logged in</h1>
+
+<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: account management</h2>
+<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
+<br clear="all"/>
+
+<h3 class="commentary">all managers and system admins can also see the content on this page; admins can edit it (and in fact can edit any field, not just the ones show below for the general user to manage their own account)</h3>
+<br clear="all"/>
+
+Username: vcb1<br/>
+First name: Violet<br/>
+Last name: Bovinea<br/>
+Screen name:<input type="text" value="Violet"/><br/>
+Email: Violet.C.Bovinea@williams.edu<br/>
+Phone: <input type="text" value=""/><br/>
+
+Williams groups:<br/>
+	Student<br/>
+	13S-BIOL-750<br/>
+	13S-ECON-101<br/>
+	13S-CSCI-371<br/>
+	13S-ARTS-300<br/>
+
+<br/>
+<br/>
+
+Notes/comments:<br/><textarea style="width: 100%;">I'll be working on a very important project in Spring 2013</textarea>
+<br/>
+<br/>
+
+<div>
+
+<h3>Alert Preferences</h3>
+
+<table>
+ <tr><td>equipment</td><td class="consumer_user">upcoming reservation reminder</td><td class="manager_user">on reservations made</td><td class="manager_user">on cancellations</td></tr>
+ <tr><td><a href="eq_group.html">other things</a></td><td class="consumer_user"><input type="checkbox"/></td><td class="manager_user"><input type="checkbox"/></td><td class="manager_user"><input type="checkbox"/></td></tr>
+</table>
+
+</div>
+
+<br/>
+<br/>
+
+<div class="consumer_user">
+
+<h3>Upcoming Reserves</h3>
+
+<table>
+ <tr><td>time</td><td>equipment</td></tr>
+ <tr><td><a href="view_reservation.html">2013/02/17 9:00PM-11:00PM</a></td><td><a href="eq_group.html">lasers : diffuser, refractor, reflector</a></td></tr>
+</table>
+
+<br/>
+<br/>
+
+<h3>Historical Reserves</h3>
+
+<table>
+ <tr><td>time</td><td>equipment</td></tr>
+ <tr><td><a href="view_reservation.html">2012/11/22 3:00PM-8:00PM</a></td><td><a href="eq_group.html">lasers : nose cone B, tray A, computer A</a></td></tr>
+</table>
+
+</div>
+
+ </body>
 <html>
\ No newline at end of file
diff --git a/doc/mockups/eq_group.html b/doc/mockups/eq_group.html
index 9a19217..2d50707 100755
--- a/doc/mockups/eq_group.html
+++ b/doc/mockups/eq_group.html
@@ -1,126 +1,126 @@
-<html xmlns="https://www.w3.org/1999/xhtml">
- <head>
-  <title>MOCK UP EqReserve: Equipment Group</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
- </head>
- <body class="consumer_user">
-
-<div class="legend general_user">general user</div>
-<div class="legend admin_user">system admin</div>
-<div class="legend manager_user">equipment mananger</div>
-<div class="legend consumer_user">consumer</div>
-<br clear="all"/>
-<h1 class="commentary">Equipment Group, logged in and has access to the group</h1>
-
-<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: Equipment Group</h2>
-
-<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
-<br clear="all"/>
-
-<h2>Lasers</h2>
-
-<p>Description description description description description description description description description description description description description description description description description description description description description description description description description description description description description description description description description description</p>
-
-Managed by: <a>Prof. Rumina</a><br/>
-<br/>
-<h3>Reservation Rules</h3>
-Reservations must start and end on one of these minutes of the hour: 0,30<br/>
-The minumum length of time that can be reserved: 30 minutes<br/>
-The maximum length of time that can be reserved: 24 hours<br/>
-
-<div class="manager_user">
-<p class="commentary">manager have the above replaced with a form</p>
-<h3>Reservation Rules</h3>
-Reservations must start and end on one of these minutes of the hour: <input type="text" value="0,30"/><br/>
-The minumum length of time that can be reserved: <input type="text" value="30"/><select><option>minutes</option></select><br/>
-The maximum length of time that can be reserved: <input type="text" value="24"/><select><option>hours</option></select><br/>
-</div>
-<br/>
-<div class="right schedule_placeholder">schedule display controls</div><br clear="both"/>
-<input type="button" value="Reserve some equipment"/> <span class="commentary">causes the form / controls below to appear, and the checkboxes and radio button to appear next to the items below.</span><br/>
-<div style="border: 1px dashed black;">
-<div class="right schedule_placeholder">scheduling gui</div>
-enter values or<br/>
-user the gui to the right<br/>
-start date/time: <input type="text"/><br/>
-end date/time: <input type="text"/><br/>
-repeat: <input type="radio" name="repeatrate" checked="true"/> not repeated |
-        <input type="radio" name="repeatrate"/> daily |
-        <input type="radio" name="repeatrate"/> weekly |
-        <input type="radio" name="repeatrate"/> monthly<br/>
-<p class="commentary">repeat rates cause addition ui elements to appear to support specifying days of week, or month, and an end date</p>
-<div class="manager_user"><input type="checkbox"/> make this a manager / maintenance reservation</div>
-Notes/comments:<br/><textarea style="width: 100%;"></textarea>
-</p>
-</div>
-
-<ul id="items_list">
- <li><h4>General Items</h4>
-  <ul>
-   <li><div class="left"><input type="checkbox"/> Full mirror</div><div class="right schedule_placeholder">schedule</div></li>
-   <li><div class="left"><input type="checkbox"/> Diffuser</div><div class="right schedule_placeholder">schedule</div>
-    <br clear="all"/>
-    <div style="border: 1px dashed black;">
-     <p class="commentary">on mouse over, or perhaps on click</p>
-     <img src="" width="300" height="200" class="right">
-     Name: <a href="eq_item.html">Diffuser</a><br/>
-     Description: ffuses two things<br/>
-     <br clear="all"/>
-     <div class="manager_user">managers get an editable form instead of a read-only display</div>
-    </div>
-   </li>
-   <li><div class="left"><input type="checkbox"/> Half-mirror</div><div class="right schedule_placeholder">schedule</div></li>
-   <li><div class="left"><input type="checkbox"/> Half-gainer</div><div class="right schedule_placeholder">schedule</div></li>
-   <li><div class="left"><input type="checkbox"/> Gainer-loser</div><div class="right schedule_placeholder">schedule</div></li>
-   <li><div class="left manager_user"><input type="button" value="+add an item+"/></li>
-  </ul>
- </li>
- <li><h4>Beam Generators</h4>
-  <ul>
-   <li><div class="left"><input type="radio" name="r_bg"/> Red</div><div class="right schedule_placeholder">schedule</div></li>
-   <li><div class="left"><input type="radio" name="r_bg"/> Green</div><div class="right schedule_placeholder">schedule</div></li>
-   <li><div class="left"><input type="radio" name="r_bg"/> Plaid</div><div class="right schedule_placeholder">schedule</div></li>
-   <li><div class="left manager_user"><input type="button" value="+add an item+"/></li>
-  </ul>
- </li>
- <li><h4>Lenses</h4>
-  <ul>
-   <li><div class="left"><input type="radio" name="r_l"/> Concentrater</div><div class="right schedule_placeholder">schedule</div></li>
-   <li><div class="left"><input type="radio" name="r_l"/> Diffuser</div><div class="right schedule_placeholder">schedule</div></li>
-   <li><div class="left"><input type="radio" name="r_l"/> Bifocal</div><div class="right schedule_placeholder">schedule</div></li>
-   <li><div class="left manager_user"><input type="button" value="+add an item+"/></li>
-  </ul>
- </li>
- <li><div class="left manager_user"><input type="button" value="+add a sub-group+"/></li>
-</ul>
-
-<br clear="both"/>
-<br/>
-<input type="button" value="View reservations as a list"/>
-<div style="border: 1px dashed black;">
-<i>list</i> of reservations (as opposed to calendar / gui view)
-</div>
-
-
-<hr>
-
-<div class="manager_user">
-user / entity access controls for this eq group
-</div>
-
-<hr>
-
-<div class="manager_user">
-reports for this group
-</div>
-
-<hr>
-
-<div class="manager_user">
-<input type="button" value="-delete this equipment group"/>
-</div>
-
- </body>
+<html xmlns="https://www.w3.org/1999/xhtml">
+ <head>
+  <title>MOCK UP EqReserve: Equipment Group</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
+ </head>
+ <body class="consumer_user">
+
+<div class="legend general_user">general user</div>
+<div class="legend admin_user">system admin</div>
+<div class="legend manager_user">equipment mananger</div>
+<div class="legend consumer_user">consumer</div>
+<br clear="all"/>
+<h1 class="commentary">Equipment Group, logged in and has access to the group</h1>
+
+<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: Equipment Group</h2>
+
+<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
+<br clear="all"/>
+
+<h2>Lasers</h2>
+
+<p>Description description description description description description description description description description description description description description description description description description description description description description description description description description description description description description description description description description</p>
+
+Managed by: <a>Prof. Rumina</a><br/>
+<br/>
+<h3>Reservation Rules</h3>
+Reservations must start and end on one of these minutes of the hour: 0,30<br/>
+The minumum length of time that can be reserved: 30 minutes<br/>
+The maximum length of time that can be reserved: 24 hours<br/>
+
+<div class="manager_user">
+<p class="commentary">manager have the above replaced with a form</p>
+<h3>Reservation Rules</h3>
+Reservations must start and end on one of these minutes of the hour: <input type="text" value="0,30"/><br/>
+The minumum length of time that can be reserved: <input type="text" value="30"/><select><option>minutes</option></select><br/>
+The maximum length of time that can be reserved: <input type="text" value="24"/><select><option>hours</option></select><br/>
+</div>
+<br/>
+<div class="right schedule_placeholder">schedule display controls</div><br clear="both"/>
+<input type="button" value="Reserve some equipment"/> <span class="commentary">causes the form / controls below to appear, and the checkboxes and radio button to appear next to the items below.</span><br/>
+<div style="border: 1px dashed black;">
+<div class="right schedule_placeholder">scheduling gui</div>
+enter values or<br/>
+user the gui to the right<br/>
+start date/time: <input type="text"/><br/>
+end date/time: <input type="text"/><br/>
+repeat: <input type="radio" name="repeatrate" checked="true"/> not repeated |
+        <input type="radio" name="repeatrate"/> daily |
+        <input type="radio" name="repeatrate"/> weekly |
+        <input type="radio" name="repeatrate"/> monthly<br/>
+<p class="commentary">repeat rates cause addition ui elements to appear to support specifying days of week, or month, and an end date</p>
+<div class="manager_user"><input type="checkbox"/> make this a manager / maintenance reservation</div>
+Notes/comments:<br/><textarea style="width: 100%;"></textarea>
+</p>
+</div>
+
+<ul id="items_list">
+ <li><h4>General Items</h4>
+  <ul>
+   <li><div class="left"><input type="checkbox"/> Full mirror</div><div class="right schedule_placeholder">schedule</div></li>
+   <li><div class="left"><input type="checkbox"/> Diffuser</div><div class="right schedule_placeholder">schedule</div>
+    <br clear="all"/>
+    <div style="border: 1px dashed black;">
+     <p class="commentary">on mouse over, or perhaps on click</p>
+     <img src="" width="300" height="200" class="right">
+     Name: <a href="eq_item.html">Diffuser</a><br/>
+     Description: ffuses two things<br/>
+     <br clear="all"/>
+     <div class="manager_user">managers get an editable form instead of a read-only display</div>
+    </div>
+   </li>
+   <li><div class="left"><input type="checkbox"/> Half-mirror</div><div class="right schedule_placeholder">schedule</div></li>
+   <li><div class="left"><input type="checkbox"/> Half-gainer</div><div class="right schedule_placeholder">schedule</div></li>
+   <li><div class="left"><input type="checkbox"/> Gainer-loser</div><div class="right schedule_placeholder">schedule</div></li>
+   <li><div class="left manager_user"><input type="button" value="+add an item+"/></li>
+  </ul>
+ </li>
+ <li><h4>Beam Generators</h4>
+  <ul>
+   <li><div class="left"><input type="radio" name="r_bg"/> Red</div><div class="right schedule_placeholder">schedule</div></li>
+   <li><div class="left"><input type="radio" name="r_bg"/> Green</div><div class="right schedule_placeholder">schedule</div></li>
+   <li><div class="left"><input type="radio" name="r_bg"/> Plaid</div><div class="right schedule_placeholder">schedule</div></li>
+   <li><div class="left manager_user"><input type="button" value="+add an item+"/></li>
+  </ul>
+ </li>
+ <li><h4>Lenses</h4>
+  <ul>
+   <li><div class="left"><input type="radio" name="r_l"/> Concentrater</div><div class="right schedule_placeholder">schedule</div></li>
+   <li><div class="left"><input type="radio" name="r_l"/> Diffuser</div><div class="right schedule_placeholder">schedule</div></li>
+   <li><div class="left"><input type="radio" name="r_l"/> Bifocal</div><div class="right schedule_placeholder">schedule</div></li>
+   <li><div class="left manager_user"><input type="button" value="+add an item+"/></li>
+  </ul>
+ </li>
+ <li><div class="left manager_user"><input type="button" value="+add a sub-group+"/></li>
+</ul>
+
+<br clear="both"/>
+<br/>
+<input type="button" value="View reservations as a list"/>
+<div style="border: 1px dashed black;">
+<i>list</i> of reservations (as opposed to calendar / gui view)
+</div>
+
+
+<hr>
+
+<div class="manager_user">
+user / entity access controls for this eq group
+</div>
+
+<hr>
+
+<div class="manager_user">
+reports for this group
+</div>
+
+<hr>
+
+<div class="manager_user">
+<input type="button" value="-delete this equipment group"/>
+</div>
+
+ </body>
 <html>
\ No newline at end of file
diff --git a/doc/mockups/eq_item.html b/doc/mockups/eq_item.html
index 6c102b4..c94e3e8 100755
--- a/doc/mockups/eq_item.html
+++ b/doc/mockups/eq_item.html
@@ -1,65 +1,65 @@
-<html xmlns="https://www.w3.org/1999/xhtml">
- <head>
-  <title>MOCK UP EqReserve: item details</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
- </head>
- <body>
-
-<div class="legend general_user">general user</div>
-<div class="legend admin_user">system admin</div>
-<div class="legend manager_user">equipment mananger</div>
-<div class="legend consumer_user">consumer</div>
-<br clear="all"/>
-<h1 class="commentary">item details - possibly redundant to the summaryinfo int eh eq group page, but it makes a handy place for pseudo-reporting specific to the item</h1>
-
-<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: item details</h2>
-
-<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
-<br clear="all"/>
-
-<p class="commentary">managers get editable versions of the below (e.g text fields instead of just text, spec-url for the image, etc.)</p>
-
-<h2>Diffuser</span></h2>
-<h2 class="manager_user">or else <input type="text" value="Diffuser" style="font-size: 24px;"/></h2>
-
-<h4>This item is in the <a href="eq_group.html">lasers</a> group.</h4>
-
-<div class="right" style="width: 400px;">
-<img src="" width="300" height="200">
-<div class="manager_user">img url: <input type="text" value="http://web.williams.edu/foo/bar.png"/></div>
-</div>
-
-<p>Description: ffuses two things</p>
-<div class="manager_user" style="width: 400px;">or else<br/>
-Description:<br/><textarea>ffuses two things</textarea>
-</div>
-
-<br clear="all"/>
-
-<hr/>
-
-<h3>Reservations</h3>
-
-<p class="commentary">number of reservation could get overwhelming - consider incremental, ajax-driven, load-on-demand approach</p>
-
-<h4>upcoming</h4>
-
-<table>
- <tr><td>who</td><td>when</td><td>equipment</td></tr>
- <tr><td><a href="account_mgt.html">Violet Bovinea</a></td><td><a href="view_reservation.html">2013/02/17 9:00PM-11:00PM</a></td><td><a href="eq_group.html">lasers : diffuser, refractor, reflector</a></td></tr>
-</table>
-
-<br clear="all"/>
-
-<h4>historical</h4>
-
-<table>
- <tr><td>who</td><td>when</td><td>equipment</td></tr>
- <tr><td><a href="account_mgt.html">Violet Bovinea</a></td><td><a href="view_reservation.html">2012/11/22 3:00PM-8:00PM</a></td><td><a href="eq_group.html">lasers : diffuser, tray A, computer A</a></td></tr>
- <tr><td><a href="account_mgt.html">Prof. Rumina</a></td><td><a href="view_reservation.html">MANAGER RESERVE 2012/10/16 12:00AM- 2012/10/22 12:00AM</a></td><td><a href="eq_group.html">lasers : diffuser, reflector</a></td></tr>
-</table>
-
- </body>
+<html xmlns="https://www.w3.org/1999/xhtml">
+ <head>
+  <title>MOCK UP EqReserve: item details</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
+ </head>
+ <body>
+
+<div class="legend general_user">general user</div>
+<div class="legend admin_user">system admin</div>
+<div class="legend manager_user">equipment mananger</div>
+<div class="legend consumer_user">consumer</div>
+<br clear="all"/>
+<h1 class="commentary">item details - possibly redundant to the summaryinfo int eh eq group page, but it makes a handy place for pseudo-reporting specific to the item</h1>
+
+<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: item details</h2>
+
+<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
+<br clear="all"/>
+
+<p class="commentary">managers get editable versions of the below (e.g text fields instead of just text, spec-url for the image, etc.)</p>
+
+<h2>Diffuser</span></h2>
+<h2 class="manager_user">or else <input type="text" value="Diffuser" style="font-size: 24px;"/></h2>
+
+<h4>This item is in the <a href="eq_group.html">lasers</a> group.</h4>
+
+<div class="right" style="width: 400px;">
+<img src="" width="300" height="200">
+<div class="manager_user">img url: <input type="text" value="http://web.williams.edu/foo/bar.png"/></div>
+</div>
+
+<p>Description: ffuses two things</p>
+<div class="manager_user" style="width: 400px;">or else<br/>
+Description:<br/><textarea>ffuses two things</textarea>
+</div>
+
+<br clear="all"/>
+
+<hr/>
+
+<h3>Reservations</h3>
+
+<p class="commentary">number of reservation could get overwhelming - consider incremental, ajax-driven, load-on-demand approach</p>
+
+<h4>upcoming</h4>
+
+<table>
+ <tr><td>who</td><td>when</td><td>equipment</td></tr>
+ <tr><td><a href="account_mgt.html">Violet Bovinea</a></td><td><a href="view_reservation.html">2013/02/17 9:00PM-11:00PM</a></td><td><a href="eq_group.html">lasers : diffuser, refractor, reflector</a></td></tr>
+</table>
+
+<br clear="all"/>
+
+<h4>historical</h4>
+
+<table>
+ <tr><td>who</td><td>when</td><td>equipment</td></tr>
+ <tr><td><a href="account_mgt.html">Violet Bovinea</a></td><td><a href="view_reservation.html">2012/11/22 3:00PM-8:00PM</a></td><td><a href="eq_group.html">lasers : diffuser, tray A, computer A</a></td></tr>
+ <tr><td><a href="account_mgt.html">Prof. Rumina</a></td><td><a href="view_reservation.html">MANAGER RESERVE 2012/10/16 12:00AM- 2012/10/22 12:00AM</a></td><td><a href="eq_group.html">lasers : diffuser, reflector</a></td></tr>
+</table>
+
+ </body>
 <html>
\ No newline at end of file
diff --git a/doc/mockups/main_logged_in_false.html b/doc/mockups/main_logged_in_false.html
index a8c644a..5e65306 100644
--- a/doc/mockups/main_logged_in_false.html
+++ b/doc/mockups/main_logged_in_false.html
@@ -1,34 +1,34 @@
-<html xmlns="https://www.w3.org/1999/xhtml">
- <head>
-  <title>MOCK UP EqReserve: main page, not logged in</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
- </head>
- <body>
-
-<div class="legend general_user">general user</div>
-<div class="legend admin_user">system admin</div>
-<div class="legend manager_user">equipment mananger</div>
-<div class="legend consumer_user">consumer</div>
-<br clear="all"/>
-<h1 class="commentary">main page, not logged in</h1>
-
-<h2>MOCK UP EqReserve: Home</h2>
-
-<p>This page has a brief description of the system, contact info for the admin, and a log in form.</p>
-
-<form>
-Username: <input type="text"/><br/>
-Password: <input type="text"/><br/>
-<input type="submit" value="log in"/>
-</form>
-
-<br clear="all"/>
-
-<h3 class="center"><a href="">about</a></h3>
-
-<br clear="all"/>
-
- </body>
+<html xmlns="https://www.w3.org/1999/xhtml">
+ <head>
+  <title>MOCK UP EqReserve: main page, not logged in</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
+ </head>
+ <body>
+
+<div class="legend general_user">general user</div>
+<div class="legend admin_user">system admin</div>
+<div class="legend manager_user">equipment mananger</div>
+<div class="legend consumer_user">consumer</div>
+<br clear="all"/>
+<h1 class="commentary">main page, not logged in</h1>
+
+<h2>MOCK UP EqReserve: Home</h2>
+
+<p>This page has a brief description of the system, contact info for the admin, and a log in form.</p>
+
+<form>
+Username: <input type="text"/><br/>
+Password: <input type="text"/><br/>
+<input type="submit" value="log in"/>
+</form>
+
+<br clear="all"/>
+
+<h3 class="center"><a href="">about</a></h3>
+
+<br clear="all"/>
+
+ </body>
 <html>
\ No newline at end of file
diff --git a/doc/mockups/main_logged_in_true.html b/doc/mockups/main_logged_in_true.html
index eda3f05..1009efc 100644
--- a/doc/mockups/main_logged_in_true.html
+++ b/doc/mockups/main_logged_in_true.html
@@ -1,78 +1,78 @@
-<html xmlns="https://www.w3.org/1999/xhtml">
- <head>
-  <title>MOCK UP EqReserve: main page, logged in</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
- </head>
- <body>
-
-<div class="legend general_user">general user</div>
-<div class="legend admin_user">system admin</div>
-<div class="legend manager_user">equipment mananger</div>
-<div class="legend consumer_user">consumer</div>
-<br clear="all"/>
-<h1 class="commentary">main page, logged in</h1>
-
-<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: Home</h2>
-
-<p>This page provides high-level navigation of the eqreserve system. It provides links to all the groups to which the user has access, with an indicaiton of why/how/degree of access. Admins also see admin tools and reports linked on this page. Users also access their prefs on this page (e.g. preferred contact email, displayed name, etc.).</p>
-
-<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
-<br clear="all"/>
-
-<p>General instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here</p>
-
-<div>
-
-<h3>Your reservations coming up in the next 3 days</h3>
-
-<table>
- <tr><td>time</td><td>equipment</td></tr>
- <tr class="manager_user"><td><a href="view_reservation.html">2013/02/17 9:00PM-11:00PM</a></td><td><a href="eq_group.html">MANAGER RESERVE lasers : diffuser, refractor, reflector</a></td></tr>
- <tr class="consumer_user"><td><a href="view_reservation.html">2013/02/19 11:30AM-4:00PM</a></td><td><a href="eq_group.html">very small things : miniscope, microscope, nanoscope</a></td></tr>
-</table>
-
-</div>
-
-<div class="left">
-<h3>Equipment Groups</h3>
-<p class="admin_user">system admins will be able to drag groups to re-order them - a small drag-handle will be shown for them</p>
- <ul>
-  <li class="manager_user"><span class="admin_user"><b>drag</b></span> <a href="eq_group.html">lasers</a> - you manage this group</li>
-  <li class="consumer_user"><span class="admin_user"><b>drag</b></span> <a href="eq_group.html">very small things</a> - you may reserve items in this group</li>
-  <li class="consumer_user"><span class="admin_user"><b>drag</b></span> <a href="eq_group.html">gargantuan things</a> - members of 13S-BIOL-750 may reserve items in this group</li>
-  <li class="admin_user"><span class="admin_user"><b>drag</b></span> <a href="eq_group.html">funky smells - you are a system admin</a><br/>
- </ul>
- <div class="admin_user">
-  <input type="button" value="+create a new equipment group+"/><br/>
-  <p>On clicking the above, shows in place the creation form:</p>
-  <form>
-   Name of group:<input type="text"/><br/>
-   Description of group:<input type="text"/><br/>
-   <input type="submit" value="create"/>
-  </form>
-  Once created then the link for the group shows up in the list
- </div>
-</div>
-
-<div class="left admin_user">
-<h3>Administration</h3>
- <ul>
-  <li><a href="manage_entities.html">manage users</a></li>
-  <li><a href="manage_entities.html">manage LDAP groups / courses</a></li>
-  <li><a href="">reports</a></li>
- </ul>
-</div>
-
-
-
-<br clear="all"/>
-<br clear="all"/>
-
-<h3 class="center"><a href="">HELP</a> | <a href="">about</a></h3>
-
-<br clear="all"/>
-
- </body>
+<html xmlns="https://www.w3.org/1999/xhtml">
+ <head>
+  <title>MOCK UP EqReserve: main page, logged in</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
+ </head>
+ <body>
+
+<div class="legend general_user">general user</div>
+<div class="legend admin_user">system admin</div>
+<div class="legend manager_user">equipment mananger</div>
+<div class="legend consumer_user">consumer</div>
+<br clear="all"/>
+<h1 class="commentary">main page, logged in</h1>
+
+<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: Home</h2>
+
+<p>This page provides high-level navigation of the eqreserve system. It provides links to all the groups to which the user has access, with an indicaiton of why/how/degree of access. Admins also see admin tools and reports linked on this page. Users also access their prefs on this page (e.g. preferred contact email, displayed name, etc.).</p>
+
+<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
+<br clear="all"/>
+
+<p>General instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here general instructions here</p>
+
+<div>
+
+<h3>Your reservations coming up in the next 3 days</h3>
+
+<table>
+ <tr><td>time</td><td>equipment</td></tr>
+ <tr class="manager_user"><td><a href="view_reservation.html">2013/02/17 9:00PM-11:00PM</a></td><td><a href="eq_group.html">MANAGER RESERVE lasers : diffuser, refractor, reflector</a></td></tr>
+ <tr class="consumer_user"><td><a href="view_reservation.html">2013/02/19 11:30AM-4:00PM</a></td><td><a href="eq_group.html">very small things : miniscope, microscope, nanoscope</a></td></tr>
+</table>
+
+</div>
+
+<div class="left">
+<h3>Equipment Groups</h3>
+<p class="admin_user">system admins will be able to drag groups to re-order them - a small drag-handle will be shown for them</p>
+ <ul>
+  <li class="manager_user"><span class="admin_user"><b>drag</b></span> <a href="eq_group.html">lasers</a> - you manage this group</li>
+  <li class="consumer_user"><span class="admin_user"><b>drag</b></span> <a href="eq_group.html">very small things</a> - you may reserve items in this group</li>
+  <li class="consumer_user"><span class="admin_user"><b>drag</b></span> <a href="eq_group.html">gargantuan things</a> - members of 13S-BIOL-750 may reserve items in this group</li>
+  <li class="admin_user"><span class="admin_user"><b>drag</b></span> <a href="eq_group.html">funky smells - you are a system admin</a><br/>
+ </ul>
+ <div class="admin_user">
+  <input type="button" value="+create a new equipment group+"/><br/>
+  <p>On clicking the above, shows in place the creation form:</p>
+  <form>
+   Name of group:<input type="text"/><br/>
+   Description of group:<input type="text"/><br/>
+   <input type="submit" value="create"/>
+  </form>
+  Once created then the link for the group shows up in the list
+ </div>
+</div>
+
+<div class="left admin_user">
+<h3>Administration</h3>
+ <ul>
+  <li><a href="manage_entities.html">manage users</a></li>
+  <li><a href="manage_entities.html">manage LDAP groups / courses</a></li>
+  <li><a href="">reports</a></li>
+ </ul>
+</div>
+
+
+
+<br clear="all"/>
+<br clear="all"/>
+
+<h3 class="center"><a href="">HELP</a> | <a href="">about</a></h3>
+
+<br clear="all"/>
+
+ </body>
 <html>
\ No newline at end of file
diff --git a/doc/mockups/manage_entities.html b/doc/mockups/manage_entities.html
index 1ddcdc5..1863b5f 100755
--- a/doc/mockups/manage_entities.html
+++ b/doc/mockups/manage_entities.html
@@ -1,140 +1,140 @@
-<html xmlns="https://www.w3.org/1999/xhtml">
- <head>
-  <title>MOCK UP EqReserve: manage entities</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
- </head>
- <body class="admin_user">
-
-<div class="legend general_user">general user</div>
-<div class="legend admin_user">system admin</div>
-<div class="legend manager_user">equipment mananger</div>
-<div class="legend consumer_user">consumer</div>
-<br clear="all"/>
-<h1 class="commentary">manage entities, system admin</h1>
-
-<h2>MOCK UP EqReserve: manage entities</h2>
-<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
-<br clear="all"/>
-
-<div class="commentary">If the search for the user or group does not find any results in the eq reserve sysem it queries the LDAP system and then creates the user/s and/or group/s in eq reserve if it gets any results from LDAP.</div>
-
-Find:<input type="text" value=""/><br/>
-<input type="button" value="all"/> <input type="button" value="users"/> <input type="button" value="Wms Groups"/>
-
-<br/><br/>
-
-<hr/>
-<h3 class="commentary">sample multi results - search for 'biol'</h3>
-
-<a href="">person: Jared Curbiol</a><br/>
-<a href="">person: Nin Abiolo</a><br/>
-<a href="">group: 13S-BIOL-101</a><br/>
-<a href="">group: 13S-BIOL-105</a><br/>
-<a href="">group: 13S-BIOL-248</a><br/>
-<a href="">group: 13S-BIOL-750 Very Advanced Biology</a><br/>
-
-
-<br/><br/>
-
-<hr/>
-<h3 class="commentary">sample user result</h3>
-
-Username: pgr1<br/>
-First name: Poa<br/>
-Last name: Rumina<br/>
-<br/>
-Is banned? <input type="checkbox"/><br/>
-<br/>
-Screen name:<input type="text" value="Prof. Rumina"/><br/>
-Email: Poa.G.Rumina@williams.edu<br/>
-Phone: <input type="text" value=""/><br/>
-<br/>
-Williams groups:<br/>
-	Faculty<br/>
-	13S-BIOL-101<br/>
-	13S-BIOL-248<br/>
-	13S-BIOL-750<br/>
-
-<br/>
-<br/>
-
-<h3>Access</h3>
-
-<table>
- <tr><td>group</td><td>type</td><td>how</td></tr>
- <tr><td><a href="">lasers</a></td><td>consumer</td><td>member of <a href="">13S-BIOL-750 (Very Advanced Biology)</a></td></tr>
- <tr><td><a href="">lasers</a></td><td><select><option>manager</option></select></td><td>direct</td></tr>
- <tr><td><a href="">very small things</a></td><td><select><option>consumer</option></select></td><td>direct</td></tr>
- <tr><td><a href="">gargantuan things</a></td><td><select><option>none</option></select></td><td></td></tr>
- <tr><td><a href="">funky smells</a></td><td><select><option>manager</option></select></td><td>direct</td></tr>
- <tr><td><a href="">other things</a></td><td><select><option>none</option></select></td><td></td></tr>
-</table>
-
-<br/>
-<br/>
-
-<h3>Upcoming Reserves</h3>
-
-<table>
- <tr><td>time</td><td>equipment</td></tr>
- <tr><td>2013/02/17 9:00PM-11:00PM</td><td><a href="">very small things: tweezers A, magnifier B</a></td></tr>
-</table>
-
-<br/>
-<br/>
-
-<h3>Historical Reserves</h3>
-
-<table>
- <tr><td>time</td><td>equipment</td></tr>
- <tr><td>2012/11/22 3:00PM-8:00PM</td><td><a href="">very small things: tweezers B, magnifier C, lights A</a></td></tr>
-</table>
-
-
-<br/><br/>
-
-<hr/>
-<h3 class="commentary">sample group result</h3>
-
-Group: 13S-BIOL-750<br/>
-
-Screen name:<input type="text" value="Very Advanced Biology"/><br/>
-
-<br/>
-<br/>
-
-<h3>Access</h3>
-
-<table>
- <tr><td>group</td><td>type</td><td>how</td></tr>
- <tr><td><a href="">lasers</a></td><td><select><option>consumer</option></select></td></tr>
- <tr><td><a href="">very small things</a></td><td><select><option>none</option></select></td></tr>
- <tr><td><a href="">gargantuan things</a></td><td><select><option>none</option></select></td></tr>
- <tr><td><a href="">funky smells</a></td><td><select><option>none</option></select></td></tr>
- <tr><td><a href="">other things</a></td><td><select><option>none</option></select></td></tr>
-</table>
-
-<br/>
-<br/>
-
-<h3>Upcoming Reserves</h3>
-
-<table>
- <tr><td>user</td><td>time</td><td>equipment</td></tr>
- <tr><td><a href="">Violet Bovinea</a></td><td>2013/02/17 9:00PM-11:00PM</td><td><a href="">lasers : nose cone A, tray B, computer A</a></td></tr>
-</table>
-
-<br/>
-<br/>
-
-<h3>Historical Reserves</h3>
-
-<table>
- <tr><td>user</td><td>time</td><td>equipment</td></tr>
- <tr><td><a href="">Violet Bovinea</a><td>2012/11/22 3:00PM-8:00PM</td><td><a href="">lasers : nose cone B, tray A, computer A</a></td></tr>
-</table>
-
- </body>
+<html xmlns="https://www.w3.org/1999/xhtml">
+ <head>
+  <title>MOCK UP EqReserve: manage entities</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
+ </head>
+ <body class="admin_user">
+
+<div class="legend general_user">general user</div>
+<div class="legend admin_user">system admin</div>
+<div class="legend manager_user">equipment mananger</div>
+<div class="legend consumer_user">consumer</div>
+<br clear="all"/>
+<h1 class="commentary">manage entities, system admin</h1>
+
+<h2>MOCK UP EqReserve: manage entities</h2>
+<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
+<br clear="all"/>
+
+<div class="commentary">If the search for the user or group does not find any results in the eq reserve sysem it queries the LDAP system and then creates the user/s and/or group/s in eq reserve if it gets any results from LDAP.</div>
+
+Find:<input type="text" value=""/><br/>
+<input type="button" value="all"/> <input type="button" value="users"/> <input type="button" value="Wms Groups"/>
+
+<br/><br/>
+
+<hr/>
+<h3 class="commentary">sample multi results - search for 'biol'</h3>
+
+<a href="">person: Jared Curbiol</a><br/>
+<a href="">person: Nin Abiolo</a><br/>
+<a href="">group: 13S-BIOL-101</a><br/>
+<a href="">group: 13S-BIOL-105</a><br/>
+<a href="">group: 13S-BIOL-248</a><br/>
+<a href="">group: 13S-BIOL-750 Very Advanced Biology</a><br/>
+
+
+<br/><br/>
+
+<hr/>
+<h3 class="commentary">sample user result</h3>
+
+Username: pgr1<br/>
+First name: Poa<br/>
+Last name: Rumina<br/>
+<br/>
+Is banned? <input type="checkbox"/><br/>
+<br/>
+Screen name:<input type="text" value="Prof. Rumina"/><br/>
+Email: Poa.G.Rumina@williams.edu<br/>
+Phone: <input type="text" value=""/><br/>
+<br/>
+Williams groups:<br/>
+	Faculty<br/>
+	13S-BIOL-101<br/>
+	13S-BIOL-248<br/>
+	13S-BIOL-750<br/>
+
+<br/>
+<br/>
+
+<h3>Access</h3>
+
+<table>
+ <tr><td>group</td><td>type</td><td>how</td></tr>
+ <tr><td><a href="">lasers</a></td><td>consumer</td><td>member of <a href="">13S-BIOL-750 (Very Advanced Biology)</a></td></tr>
+ <tr><td><a href="">lasers</a></td><td><select><option>manager</option></select></td><td>direct</td></tr>
+ <tr><td><a href="">very small things</a></td><td><select><option>consumer</option></select></td><td>direct</td></tr>
+ <tr><td><a href="">gargantuan things</a></td><td><select><option>none</option></select></td><td></td></tr>
+ <tr><td><a href="">funky smells</a></td><td><select><option>manager</option></select></td><td>direct</td></tr>
+ <tr><td><a href="">other things</a></td><td><select><option>none</option></select></td><td></td></tr>
+</table>
+
+<br/>
+<br/>
+
+<h3>Upcoming Reserves</h3>
+
+<table>
+ <tr><td>time</td><td>equipment</td></tr>
+ <tr><td>2013/02/17 9:00PM-11:00PM</td><td><a href="">very small things: tweezers A, magnifier B</a></td></tr>
+</table>
+
+<br/>
+<br/>
+
+<h3>Historical Reserves</h3>
+
+<table>
+ <tr><td>time</td><td>equipment</td></tr>
+ <tr><td>2012/11/22 3:00PM-8:00PM</td><td><a href="">very small things: tweezers B, magnifier C, lights A</a></td></tr>
+</table>
+
+
+<br/><br/>
+
+<hr/>
+<h3 class="commentary">sample group result</h3>
+
+Group: 13S-BIOL-750<br/>
+
+Screen name:<input type="text" value="Very Advanced Biology"/><br/>
+
+<br/>
+<br/>
+
+<h3>Access</h3>
+
+<table>
+ <tr><td>group</td><td>type</td><td>how</td></tr>
+ <tr><td><a href="">lasers</a></td><td><select><option>consumer</option></select></td></tr>
+ <tr><td><a href="">very small things</a></td><td><select><option>none</option></select></td></tr>
+ <tr><td><a href="">gargantuan things</a></td><td><select><option>none</option></select></td></tr>
+ <tr><td><a href="">funky smells</a></td><td><select><option>none</option></select></td></tr>
+ <tr><td><a href="">other things</a></td><td><select><option>none</option></select></td></tr>
+</table>
+
+<br/>
+<br/>
+
+<h3>Upcoming Reserves</h3>
+
+<table>
+ <tr><td>user</td><td>time</td><td>equipment</td></tr>
+ <tr><td><a href="">Violet Bovinea</a></td><td>2013/02/17 9:00PM-11:00PM</td><td><a href="">lasers : nose cone A, tray B, computer A</a></td></tr>
+</table>
+
+<br/>
+<br/>
+
+<h3>Historical Reserves</h3>
+
+<table>
+ <tr><td>user</td><td>time</td><td>equipment</td></tr>
+ <tr><td><a href="">Violet Bovinea</a><td>2012/11/22 3:00PM-8:00PM</td><td><a href="">lasers : nose cone B, tray A, computer A</a></td></tr>
+</table>
+
+ </body>
 <html>
\ No newline at end of file
diff --git a/doc/mockups/mockup_list.txt b/doc/mockups/mockup_list.txt
index 6681547..5131321 100755
--- a/doc/mockups/mockup_list.txt
+++ b/doc/mockups/mockup_list.txt
@@ -1,15 +1,15 @@
-X  main, not logged in
-X  main, logged in
-X  account managment, logged in
-X  manage entities
-X  eq group
-X  eq item details
-?  make reservation - this seems it can be fully subsumed into the eq_group page
-X  view reservation
-  
-  
-  
-  
-  
-  
+X  main, not logged in
+X  main, logged in
+X  account managment, logged in
+X  manage entities
+X  eq group
+X  eq item details
+?  make reservation - this seems it can be fully subsumed into the eq_group page
+X  view reservation
+  
+  
+  
+  
+  
+  
   
\ No newline at end of file
diff --git a/doc/mockups/mockup_style.css b/doc/mockups/mockup_style.css
index d4bcee1..b5fc192 100644
--- a/doc/mockups/mockup_style.css
+++ b/doc/mockups/mockup_style.css
@@ -1,72 +1,72 @@
-html {
-    background-color: #000;
-    margin: 0;
-}
-
-body {
-    font: 14px arial, Helvetica, sans-serif;
-    margin: 0 auto;
-    padding: 3px 5px;
-    width: 960px;
-    background-color: #ddd;
-}
-
-div {
-    margin: 3px 6px;
-    padding: 3px;
-}
-
-h1 {
-    text-align: center;
-}
-h2, h3, h4, h5, h6 {
-    margin: 3px 0 2px 0;
-}
-
-.commentary {
-    color: #777;
-    font-style: italic;
-}
-
-.legend {
-    width: 120px;
-    height: 40px;
-    text-align: center;
-    vertical-align: middle;
-    padding: 3px 6px;
-    margin: 3px 12px;
-    float: left;
-    border: 1px solid #bbb;
-}
-
-.general_user {
-    background-color: #ddd;
-}
-
-.admin_user {
-    background-color: #edd;
-}
-
-.manager_user {
-    background-color: #ddf;
-}
-
-.consumer_user {
-    background-color: #ded;
-}
-
-.left { float: left; }
-.right { float: right; }
-.center { text-align: center; }
-
-#items_list li {
-    list-style: none;
-    clear: both;
-}
-
-.schedule_placeholder {
-    width: 720px;
-    height: 18px;
-    background-color: #999;
-    text-align: center;
+html {
+    background-color: #000;
+    margin: 0;
+}
+
+body {
+    font: 14px arial, Helvetica, sans-serif;
+    margin: 0 auto;
+    padding: 3px 5px;
+    width: 960px;
+    background-color: #ddd;
+}
+
+div {
+    margin: 3px 6px;
+    padding: 3px;
+}
+
+h1 {
+    text-align: center;
+}
+h2, h3, h4, h5, h6 {
+    margin: 3px 0 2px 0;
+}
+
+.commentary {
+    color: #777;
+    font-style: italic;
+}
+
+.legend {
+    width: 120px;
+    height: 40px;
+    text-align: center;
+    vertical-align: middle;
+    padding: 3px 6px;
+    margin: 3px 12px;
+    float: left;
+    border: 1px solid #bbb;
+}
+
+.general_user {
+    background-color: #ddd;
+}
+
+.admin_user {
+    background-color: #edd;
+}
+
+.manager_user {
+    background-color: #ddf;
+}
+
+.consumer_user {
+    background-color: #ded;
+}
+
+.left { float: left; }
+.right { float: right; }
+.center { text-align: center; }
+
+#items_list li {
+    list-style: none;
+    clear: both;
+}
+
+.schedule_placeholder {
+    width: 720px;
+    height: 18px;
+    background-color: #999;
+    text-align: center;
 }
\ No newline at end of file
diff --git a/doc/mockups/view_reservation.html b/doc/mockups/view_reservation.html
index b8d66aa..2b3f81b 100755
--- a/doc/mockups/view_reservation.html
+++ b/doc/mockups/view_reservation.html
@@ -1,66 +1,66 @@
-<html xmlns="https://www.w3.org/1999/xhtml">
- <head>
-  <title>MOCK UP EqReserve: view reservation</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
- </head>
- <body class="consumer_user">
-
-<div class="legend general_user">general user</div>
-<div class="legend admin_user">system admin</div>
-<div class="legend manager_user">equipment mananger</div>
-<div class="legend consumer_user">consumer</div>
-<br clear="all"/>
-<h1 class="commentary">view reservation, creator or eq manager</h1>
-
-<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: View Reservation</h2>
-
-<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
-<br clear="all"/>
-
-<div class="manager_user">
-<p class="commentary">if this is a management reservation (as opposed to a normal reservation made by someone who has manager role)</p>
-<h1 style="color: #b22;">MANAGER RESERVATION</h1>
-</div>
-
-Notes/comments:<br/><textarea style="width: 100%;">this is a very important project</textarea>
-<br/>
-<br/>
-
-The following <a href="eq_group.html">lasers</a> equipment is reserved:
-<ul>
-   <li>Diffuser
-    <br clear="all"/>
-    <div style="border: 1px dashed black;">
-     <p class="commentary">on mouse over, or perhaps on click</p>
-     <img src="" width="300" height="200" class="right">
-     Name: Diffuser<br/>
-     Description: ffuses both the things<br/>
-     <br clear="all"/>
-    </div>
-   </li>
- <li>Refractor</li>
- <li>Reflector</li>
-</ul>
-
-<p class="commentary">list of time blocks in this time block group, ordered from past to future; past ones grayed out, next upcoming bolded</p>
-For the following times:  <input type="button" value="cancel all"/><br/>
-<ul>
- <li style="color:#777;">past: 2012/10/17 9:00 PM - 11:00 PM</li>
- <li><b>2013/02/17 9:00 PM - 11:00 PM</b> <input type="button" value="edit this"/> <input type="button" value="cancel this"/>
-	<div style="border: 1px dashed black;">
-	<p class="commentary">on clicking the edit button</p>
-<div class="right schedule_placeholder">scheduling gui</div>
-	enter values or<br/>
-	user the gui to the right<br/>
-	start date/time: <input type="text"/><br/>
-	end date/time: <input type="text"/><br/>
-	<br clear="all"/>
-	</div>
- </li>
- <li>2013/06/17 9:00 PM - 11:00 PM <input type="button" value="edit this"/> <input type="button" value="cancel this"/></li>
-</ul>
-
- </body>
+<html xmlns="https://www.w3.org/1999/xhtml">
+ <head>
+  <title>MOCK UP EqReserve: view reservation</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+  <link rel='stylesheet' href='mockup_style.css' type='text/css' media='all' />
+ </head>
+ <body class="consumer_user">
+
+<div class="legend general_user">general user</div>
+<div class="legend admin_user">system admin</div>
+<div class="legend manager_user">equipment mananger</div>
+<div class="legend consumer_user">consumer</div>
+<br clear="all"/>
+<h1 class="commentary">view reservation, creator or eq manager</h1>
+
+<h2><a href="main_logged_in_true.html">MOCK UP EqReserve</a>: View Reservation</h2>
+
+<div class="right">You are logged in as <a href="account_mgt.html">Violet Bovinea</a>. <input type="button" value="logout"/></div>
+<br clear="all"/>
+
+<div class="manager_user">
+<p class="commentary">if this is a management reservation (as opposed to a normal reservation made by someone who has manager role)</p>
+<h1 style="color: #b22;">MANAGER RESERVATION</h1>
+</div>
+
+Notes/comments:<br/><textarea style="width: 100%;">this is a very important project</textarea>
+<br/>
+<br/>
+
+The following <a href="eq_group.html">lasers</a> equipment is reserved:
+<ul>
+   <li>Diffuser
+    <br clear="all"/>
+    <div style="border: 1px dashed black;">
+     <p class="commentary">on mouse over, or perhaps on click</p>
+     <img src="" width="300" height="200" class="right">
+     Name: Diffuser<br/>
+     Description: ffuses both the things<br/>
+     <br clear="all"/>
+    </div>
+   </li>
+ <li>Refractor</li>
+ <li>Reflector</li>
+</ul>
+
+<p class="commentary">list of time blocks in this time block group, ordered from past to future; past ones grayed out, next upcoming bolded</p>
+For the following times:  <input type="button" value="cancel all"/><br/>
+<ul>
+ <li style="color:#777;">past: 2012/10/17 9:00 PM - 11:00 PM</li>
+ <li><b>2013/02/17 9:00 PM - 11:00 PM</b> <input type="button" value="edit this"/> <input type="button" value="cancel this"/>
+	<div style="border: 1px dashed black;">
+	<p class="commentary">on clicking the edit button</p>
+<div class="right schedule_placeholder">scheduling gui</div>
+	enter values or<br/>
+	user the gui to the right<br/>
+	start date/time: <input type="text"/><br/>
+	end date/time: <input type="text"/><br/>
+	<br clear="all"/>
+	</div>
+ </li>
+ <li>2013/06/17 9:00 PM - 11:00 PM <input type="button" value="edit this"/> <input type="button" value="cancel this"/></li>
+</ul>
+
+ </body>
 <html>
\ No newline at end of file
diff --git a/head.php b/head.php
index fc827ab..c6d2956 100755
--- a/head.php
+++ b/head.php
@@ -1,27 +1,27 @@
-<?php
-session_start();
-require_once('institution.cfg.php');
-
-echo "head loaded\n";
-
-if ((! isset($_SESSION['isAuthenticated'])) || (! $_SESSION['isAuthenticated'])) {
-//echo 'session not authenticated';
-    if ((isset($_REQUEST['username'])) && (isset($_REQUEST['password']))) {
-//echo "trying to authenticate\n";
-//echo 'username = '.$_REQUEST['username']."\n";
-//echo 'password = '.$_REQUEST['password']."\n";
-        require_once('auth.cfg.php');
-        $_SESSION['isAuthenticated'] = $AUTH->authenticate($_REQUEST['username'],$_REQUEST['password']);
-//echo "post authenticate attempt\n";
-//echo 'isAuthenticated = '.$_SESSION['isAuthenticated']."\n";
-    }    
-}
-
-$DB = new PDO("mysql:host=".DB_SERVER.";dbname=".DB_NAME.";port=3306",DB_USER,DB_PASS);
-
-?>
-<html>
- <head>
-  <title><?php echo APP_NAME.': '.$pageTitle;?></title>
- </head>
- <body>
+<?php
+session_start();
+require_once('institution.cfg.php');
+
+echo "head loaded\n";
+
+if ((! isset($_SESSION['isAuthenticated'])) || (! $_SESSION['isAuthenticated'])) {
+//echo 'session not authenticated';
+    if ((isset($_REQUEST['username'])) && (isset($_REQUEST['password']))) {
+//echo "trying to authenticate\n";
+//echo 'username = '.$_REQUEST['username']."\n";
+//echo 'password = '.$_REQUEST['password']."\n";
+        require_once('auth.cfg.php');
+        $_SESSION['isAuthenticated'] = $AUTH->authenticate($_REQUEST['username'],$_REQUEST['password']);
+//echo "post authenticate attempt\n";
+//echo 'isAuthenticated = '.$_SESSION['isAuthenticated']."\n";
+    }    
+}
+
+$DB = new PDO("mysql:host=".DB_SERVER.";dbname=".DB_NAME.";port=3306",DB_USER,DB_PASS);
+
+?>
+<html>
+ <head>
+  <title><?php echo APP_NAME.': '.$pageTitle;?></title>
+ </head>
+ <body>
diff --git a/tests/app_infrastructure_tests/TestOfAuth_Base.class.php b/tests/app_infrastructure_tests/TestOfAuth_Base.class.php
index 78fd9cf..4cf6eb2 100755
--- a/tests/app_infrastructure_tests/TestOfAuth_Base.class.php
+++ b/tests/app_infrastructure_tests/TestOfAuth_Base.class.php
@@ -1,31 +1,31 @@
-<?php
-
-require_once dirname(__FILE__) . '/../../classes/auth_base.class.php';
-
-class TestOfAuth_Base extends UnitTestCase {
-
-    function testClassExists() {
-        // no real test - the require at the top of the file is enough
-        $this->assertTrue(1==1);
-    }
-
-    function testAuthenticateTestUser() {
-        // no real test - the require at the top of the file is enough
-        $AUTH = new Auth_Base();        
-        $this->assertTrue($AUTH->authenticate(TESTINGUSER,TESTINGPASSWORD));
-    }
-
-    function testAuthenticateNontestUserFails() {
-        // no real test - the require at the top of the file is enough
-        $AUTH = new Auth_Base();        
-        $this->assertFalse($AUTH->authenticate(TESTINGUSER.'foo',TESTINGPASSWORD));
-    }
-
-    function testAuthenticateTestUserBaddPasswordFails() {
-        // no real test - the require at the top of the file is enough
-        $AUTH = new Auth_Base();        
-        $this->assertFalse($AUTH->authenticate(TESTINGUSER,TESTINGPASSWORD.'foo'));
-    }
-
-}
+<?php
+
+require_once dirname(__FILE__) . '/../../classes/auth_base.class.php';
+
+class TestOfAuth_Base extends UnitTestCase {
+
+    function testClassExists() {
+        // no real test - the require at the top of the file is enough
+        $this->assertTrue(1==1);
+    }
+
+    function testAuthenticateTestUser() {
+        // no real test - the require at the top of the file is enough
+        $AUTH = new Auth_Base();        
+        $this->assertTrue($AUTH->authenticate(TESTINGUSER,TESTINGPASSWORD));
+    }
+
+    function testAuthenticateNontestUserFails() {
+        // no real test - the require at the top of the file is enough
+        $AUTH = new Auth_Base();        
+        $this->assertFalse($AUTH->authenticate(TESTINGUSER.'foo',TESTINGPASSWORD));
+    }
+
+    function testAuthenticateTestUserBaddPasswordFails() {
+        // no real test - the require at the top of the file is enough
+        $AUTH = new Auth_Base();        
+        $this->assertFalse($AUTH->authenticate(TESTINGUSER,TESTINGPASSWORD.'foo'));
+    }
+
+}
 ?>
\ No newline at end of file
diff --git a/tests/app_infrastructure_tests/TestOfAuth_LDAP.class.php b/tests/app_infrastructure_tests/TestOfAuth_LDAP.class.php
index 50a26c6..18123cc 100755
--- a/tests/app_infrastructure_tests/TestOfAuth_LDAP.class.php
+++ b/tests/app_infrastructure_tests/TestOfAuth_LDAP.class.php
@@ -1,31 +1,31 @@
-<?php
-
-require_once dirname(__FILE__) . '/../../classes/auth_ldap.class.php';
-
-class TestOfAuth_LDAP extends UnitTestCase {
-
-    function testClassExists() {
-        // no real test - the require at the top of the file is enough
-        $this->assertTrue(1==1);
-    }
-
-    function testAuthenticateTestUser() {
-        // no real test - the require at the top of the file is enough
-        $AUTH = new Auth_LDAP();        
-        $this->assertTrue($AUTH->authenticate(TESTINGUSER,TESTINGPASSWORD));
-    }
-
-    function testAuthenticateNontestUserFails() {
-        // no real test - the require at the top of the file is enough
-        $AUTH = new Auth_LDAP();        
-        $this->assertFalse($AUTH->authenticate(TESTINGUSER.'foo',TESTINGPASSWORD));
-    }
-
-    function testAuthenticateTestUserBaddPasswordFails() {
-        // no real test - the require at the top of the file is enough
-        $AUTH = new Auth_LDAP();        
-        $this->assertFalse($AUTH->authenticate(TESTINGUSER,TESTINGPASSWORD.'foo'));
-    }
-
-}
+<?php
+
+require_once dirname(__FILE__) . '/../../classes/auth_ldap.class.php';
+
+class TestOfAuth_LDAP extends UnitTestCase {
+
+    function testClassExists() {
+        // no real test - the require at the top of the file is enough
+        $this->assertTrue(1==1);
+    }
+
+    function testAuthenticateTestUser() {
+        // no real test - the require at the top of the file is enough
+        $AUTH = new Auth_LDAP();        
+        $this->assertTrue($AUTH->authenticate(TESTINGUSER,TESTINGPASSWORD));
+    }
+
+    function testAuthenticateNontestUserFails() {
+        // no real test - the require at the top of the file is enough
+        $AUTH = new Auth_LDAP();        
+        $this->assertFalse($AUTH->authenticate(TESTINGUSER.'foo',TESTINGPASSWORD));
+    }
+
+    function testAuthenticateTestUserBaddPasswordFails() {
+        // no real test - the require at the top of the file is enough
+        $AUTH = new Auth_LDAP();        
+        $this->assertFalse($AUTH->authenticate(TESTINGUSER,TESTINGPASSWORD.'foo'));
+    }
+
+}
 ?>
\ No newline at end of file
diff --git a/tests/app_infrastructure_tests/TestOfDB_Linked.class.php b/tests/app_infrastructure_tests/TestOfDB_Linked.class.php
index de83449..08bc376 100755
--- a/tests/app_infrastructure_tests/TestOfDB_Linked.class.php
+++ b/tests/app_infrastructure_tests/TestOfDB_Linked.class.php
@@ -1,10 +1,10 @@
-<?php
-require_once dirname(__FILE__) . '/../simpletest/unit_tester_DB.php';
-require_once dirname(__FILE__) . '/../../classes/db_linked.class.php';
-
-class TestOfDB_Linked extends UnitTestCaseDB {
-    function testConnectedToDatabase() {
-        $this->assertNotNull($this->DB);
-    }
-}
+<?php
+require_once dirname(__FILE__) . '/../simpletest/unit_tester_DB.php';
+require_once dirname(__FILE__) . '/../../classes/db_linked.class.php';
+
+class TestOfDB_Linked extends UnitTestCaseDB {
+    function testConnectedToDatabase() {
+        $this->assertNotNull($this->DB);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/tests/phpinfo.php b/tests/phpinfo.php
index d2b25e4..968c8df 100755
--- a/tests/phpinfo.php
+++ b/tests/phpinfo.php
@@ -1,3 +1,3 @@
-<?php
-phpinfo();
+<?php
+phpinfo();
 ?>
\ No newline at end of file
diff --git a/tests/simpletest/test/autorun_test.php b/tests/simpletest/test/autorun_test.php
index d85ea19..67a884c 100755
--- a/tests/simpletest/test/autorun_test.php
+++ b/tests/simpletest/test/autorun_test.php
@@ -1,23 +1,23 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/support/test1.php');
-
-class TestOfAutorun extends UnitTestCase {
-    function testLoadIfIncluded() {
-        $tests = new TestSuite();
-        $tests->addFile(dirname(__FILE__) . '/support/test1.php');
-        $this->assertEqual($tests->getSize(), 1);
-    }
-
-    function testExitStatusOneIfTestsFail() {
-        exec('php ' . dirname(__FILE__) . '/support/failing_test.php', $output, $exit_status);
-        $this->assertEqual($exit_status, 1);
-    }
-
-    function testExitStatusZeroIfTestsPass() {
-        exec('php ' . dirname(__FILE__) . '/support/passing_test.php', $output, $exit_status);
-        $this->assertEqual($exit_status, 0);
-    }
-}
-
+<?php
+require_once(dirname(__FILE__) . '/../autorun.php');
+require_once(dirname(__FILE__) . '/support/test1.php');
+
+class TestOfAutorun extends UnitTestCase {
+    function testLoadIfIncluded() {
+        $tests = new TestSuite();
+        $tests->addFile(dirname(__FILE__) . '/support/test1.php');
+        $this->assertEqual($tests->getSize(), 1);
+    }
+
+    function testExitStatusOneIfTestsFail() {
+        exec('php ' . dirname(__FILE__) . '/support/failing_test.php', $output, $exit_status);
+        $this->assertEqual($exit_status, 1);
+    }
+
+    function testExitStatusZeroIfTestsPass() {
+        exec('php ' . dirname(__FILE__) . '/support/passing_test.php', $output, $exit_status);
+        $this->assertEqual($exit_status, 0);
+    }
+}
+
 ?>
\ No newline at end of file