Squashed commit of the following:

commit c6cd4f7c3e3f0399275aebea398cefcbbbc1491f
Merge: 2765635 32abffb
Author: Thomas Adams <heinrich.adams@gmail.com>
Date:   Wed Oct 15 21:36:33 2014 +0800

    Merge branch 'master' of https://github.com/Thomas-Adams/todo-manager.git into local

commit 27656354b3c98cced6cecf7c6d1c3077998afdcc
Author: Thomas Adams <heinrich.adams@gmail.com>
Date:   Wed Oct 15 21:26:03 2014 +0800

    file upload library blueimp

    Signed-off-by: Thomas Adams <heinrich.adams@gmail.com>