156 commits

Author	SHA1	Message	Date
ThomasV	8b9cff638f	kivy: fix tx dialog	2015-09-04 12:19:24 +02:00
ThomasV	04b9d8fffa	Update kivy GUI in order to merge with master	2015-09-03 15:09:45 +02:00
akshayaurora	cd4f8a074c	include NFC changes required for transferring data	2015-09-03 14:23:45 +02:00
akshayaurora	f442cc31e4	Abstract and enable qrscanner dialog for send screen.	2015-09-03 14:22:51 +02:00
akshayaurora	33c89b47d8	revert dynamic loading of screens and fix qrscanning	2015-09-03 14:22:25 +02:00
akshayaurora	c121c1aa4e	reorganize files and bring code inline with current master ... Conflicts: lib/simple_config.py	2015-09-03 14:20:37 +02:00