Merge branch 'development'
Releasing 1.3.1 beta 2
Merge branch 'master' into development
Merge branch 'development' into links_on_list
Correcting list height and separator
Saving waiting list on debug
Merge branch 'links_on_list' into development