Squashed commit of the following:

commit 2f550e7f8e704fa94bfc95647128e026d58a8c52
Merge: e42fd6b 48745d9
Author: Chris Jones <cajones@users.noreply.github.com>
Date:   Mon Jan 20 07:47:05 2014 -0800

    Merge pull request #10 from adaptlearning/issue/7

    Adding icons

commit 48745d90745ef3e09d162134c7dc0c6f26a49326
Merge: 7d106be e42fd6b
Author: Chris Jones <chris.jones@spongeuk.com>
Date:   Mon Jan 20 15:29:41 2014 +0000

    resolve merge conflict by including position:relative in the less file

commit e42fd6bfd435391fd9ce2e1d1de900d24950f171
Merge: eecba1b aa94550
Author: Chris Jones <cajones@users.noreply.github.com>
Date:   Mon Jan 20 07:16:19 2014 -0800

    Merge pull request #11 from zenduo/develop

    Consistency updates and use of global vars

commit 7d106bee3bde803f63c40da9655734769cd8a188
Author: Kevin Corry <kevinc@learningpool.com>
Date:   Thu Jan 16 16:34:55 2014 +0000

    Fix for issue #7

commit aa9455056cfdf157b51f8907b87da260bef70cf5
Author: Alan Bourne <alan@zenduo.co.uk>
Date:   Thu Jan 16 16:32:12 2014 +0000

    Consistency updates and use of global vars