fghfgfgd
Squashed commit of the following:

commit fce21f0e1082f71a53d016182cfe5f32a3765480
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 19:38:02 2014 -0500

    change configpwList

commit f76640deeaafbff043e218bc234b6fd8ba4ff9d5
Merge: e0fefcc 8f44116
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 18:39:36 2014 -0500

    Merge branch 'master' of https://github.com/Oreoz/GTI619-Final

    Conflicts:

    	src/main/java/main/java/ca/etsmtl/gti619/lab5/spring/web/controller/MainController.java
    	src/main/webapp/WEB-INF/pages/admin.jsp

commit e0fefccb7b31eff91ccaedaa27d46d7c8e11dbc8
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 18:38:30 2014 -0500

    configs

commit dc92672fa4cf92f419c0244d7a53ed9502d339f9
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 17:27:37 2014 -0500

    uncomment password change

commit 8d15acfc9e1fb9462814bd7203f63772477a7191
Merge: 08c0e77 edeac5f
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 17:26:32 2014 -0500

    Merge branch 'master' of https://github.com/Oreoz/GTI619-Final

    Conflicts:
    	.classpath

commit 08c0e773d0db4775701b42c6971e16031e508ca9
Merge: 4d973d2 f742e1e
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 17:17:11 2014 -0500

    merge

commit 4d973d2895769ade35ab0253e33093ddfe76b2bd
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 17:13:16 2014 -0500

    config update

commit a87f5e42d8d2cdbe215a02987cafc0ca40347d4c
Author: Naksej <dsads>
Date:   Fri Nov 28 14:56:39 2014 -0500

    MAGIE

commit e8508b04c04e31938069c58d8b1d28fdb11cafec
Author: Naksej <dsads>
Date:   Fri Nov 28 14:29:08 2014 -0500

    sasa

commit e448eef6c3b4000590492046b609cc91ce8b74e6
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 14:22:39 2014 -0500

    config

commit 2501128ee6edeffc82352c96001e5b375cdaf186
Author: Naksej <dsads>
Date:   Fri Nov 28 13:43:40 2014 -0500

    fdsdsa
Squashed commit of the following:

commit fce21f0e1082f71a53d016182cfe5f32a3765480
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 19:38:02 2014 -0500

    change configpwList

commit f76640deeaafbff043e218bc234b6fd8ba4ff9d5
Merge: e0fefcc 8f44116
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 18:39:36 2014 -0500

    Merge branch 'master' of https://github.com/Oreoz/GTI619-Final

    Conflicts:

    	src/main/java/main/java/ca/etsmtl/gti619/lab5/spring/web/controller/MainController.java
    	src/main/webapp/WEB-INF/pages/admin.jsp

commit e0fefccb7b31eff91ccaedaa27d46d7c8e11dbc8
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 18:38:30 2014 -0500

    configs

commit dc92672fa4cf92f419c0244d7a53ed9502d339f9
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 17:27:37 2014 -0500

    uncomment password change

commit 8d15acfc9e1fb9462814bd7203f63772477a7191
Merge: 08c0e77 edeac5f
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 17:26:32 2014 -0500

    Merge branch 'master' of https://github.com/Oreoz/GTI619-Final

    Conflicts:
    	.classpath

commit 08c0e773d0db4775701b42c6971e16031e508ca9
Merge: 4d973d2 f742e1e
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 17:17:11 2014 -0500

    merge

commit 4d973d2895769ade35ab0253e33093ddfe76b2bd
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 17:13:16 2014 -0500

    config update

commit a87f5e42d8d2cdbe215a02987cafc0ca40347d4c
Author: Naksej <dsads>
Date:   Fri Nov 28 14:56:39 2014 -0500

    MAGIE

commit e8508b04c04e31938069c58d8b1d28fdb11cafec
Author: Naksej <dsads>
Date:   Fri Nov 28 14:29:08 2014 -0500

    sasa

commit e448eef6c3b4000590492046b609cc91ce8b74e6
Author: fokasu <marcandrebr@gmail.com>
Date:   Fri Nov 28 14:22:39 2014 -0500

    config

commit 2501128ee6edeffc82352c96001e5b375cdaf186
Author: Naksej <dsads>
Date:   Fri Nov 28 13:43:40 2014 -0500

    fdsdsa