added ACCESS_NETWORK_STATE permission
formatting
use sync options in SynchroniserService
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta' into beta-ics
fixed possible NPE
Merge branch 'beta' into beta-ics
Merge branch 'master' into beta
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into beta-ics
10 sec delay on SynchroniserService start
Merge branch 'master' into beta
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics